Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rb4a4e908a52add3617f10b8c64daf695d5402f82 -r4426279c62834310e77988280c07df4021134f3f
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b4a4e908a52add3617f10b8c64daf695d5402f82)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 4426279c62834310e77988280c07df4021134f3f)
@@ -351,6 +351,8 @@
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
 
+    checkPersistentAlarm( ALARM_ID_HD_AIR_TRAP_UPPER_LEVEL_FLUID_TIME_OUT, FALSE, (F32)AIR_TRAP_LEVEL_FLUID, (F32)AIR_TRAP_LEVEL_FLUID );
+
     return result;
 }
 
@@ -535,10 +537,10 @@
  *************************************************************************/
 static void checkAirTrapUpperLevelFluidTimeout( void )
 {
-    if ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
-    {
-        checkPersistentAlarm( ALARM_ID_HD_AIR_TRAP_UPPER_LEVEL_FLUID_TIME_OUT, TRUE, (F32)AIR_TRAP_LEVEL_FLUID, (F32)AIR_TRAP_LEVEL_FLUID );
-    }
+    AIR_TRAP_LEVELS_T upperLevel = getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );
+    BOOL isUpperLevelFluid       = ( AIR_TRAP_LEVEL_FLUID == upperLevel ? TRUE : FALSE );
+
+    checkPersistentAlarm( ALARM_ID_HD_AIR_TRAP_UPPER_LEVEL_FLUID_TIME_OUT, isUpperLevelFluid, (F32)AIR_TRAP_LEVEL_FLUID, (F32)AIR_TRAP_LEVEL_FLUID );
 }
 
 /*********************************************************************//**