diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index 4a2dd208c6..3237f1f9e8 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -259,7 +259,7 @@ namespace Content.Server.Atmos.Monitor.Systems
 
             foreach (var alarmState in alarmable.NetworkAlarmStates.Values)
             {
-                alarm = alarm < alarmState ? alarmState : alarm;
+                alarm = alarm == null || alarm < alarmState ? alarmState : alarm;
             }
 
             return alarm != null;