diff --git a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
index 1d72aa8ff7..4e45f9548b 100644
--- a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.AlertLevel;
 using Content.Server.Atmos.Monitor.Components;
+using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -26,8 +27,16 @@ namespace Content.Server.Atmos.Monitor.Systems
 
         private void OnDeviceListSync(EntityUid uid, FireAlarmComponent component, DeviceListUpdateEvent args)
         {
-            _atmosDevNet.Register(uid, null);
-            _atmosDevNet.Sync(uid, null);
+            foreach (var ent in args.Devices)
+            {
+                if (!TryComp<DeviceNetworkComponent>(ent, out var devNet))
+                {
+                    continue;
+                }
+
+                _atmosDevNet.Register(uid, devNet.Address);
+                _atmosDevNet.Sync(uid, devNet.Address);
+            }
         }
 
         private void OnInteractHand(EntityUid uid, FireAlarmComponent component, InteractHandEvent args)