diff --git a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
index 18e9b7a46c..a5ea2d5bf0 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
@@ -25,6 +25,9 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
     /// <summary>
     /// Gets the given device list as a dictionary
     /// </summary>
+    /// <remarks>
+    /// If any entity in the device list is pre-map init, it will show the entity UID of the device instead.
+    /// </remarks>
     public Dictionary<string, EntityUid> GetDeviceList(EntityUid uid, DeviceListComponent? deviceList = null)
     {
         if (!Resolve(uid, ref deviceList))
@@ -37,7 +40,11 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
             if (!TryComp(deviceUid, out DeviceNetworkComponent? deviceNet))
                 continue;
 
-            devices.Add(deviceNet.Address, deviceUid);
+            var address = MetaData(deviceUid).EntityLifeStage == EntityLifeStage.MapInitialized
+                ? deviceNet.Address
+                : $"UID: {deviceUid.ToString()}";
+
+            devices.Add(address, deviceUid);
 
         }