Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r6e30feb28cf365c5c26a9a7283e944b4c24a11cb -re044317c454510482d8a04da1f78cff380a6e7d1
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 6e30feb28cf365c5c26a9a7283e944b4c24a11cb)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e044317c454510482d8a04da1f78cff380a6e7d1)
@@ -68,7 +68,7 @@
 static U32  fillStartTime = 0;                                                              ///< Time stamp for start of air trap fill.
 
 static U32 airTrapUpperLevelCtr = 0;                                                        ///< Timer count for upper level persistence.
-static U32  airTrapIllegalLevelSensorsCtr = 0;                                              ///< Timer counter for illegal level sensor fault.
+static U32 airTrapIllegalLevelSensorsCtr = 0;                                               ///< Timer counter for illegal level sensor fault.
 
 // ********** private function prototypes **********
 
@@ -182,8 +182,9 @@
     airTrapLevels[ AIR_TRAP_LEVEL_SENSOR_LOWER ].data = (U32)( TRUE == lower ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
     airTrapLevels[ AIR_TRAP_LEVEL_SENSOR_UPPER ].data = (U32)( TRUE == upper ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
 
-    if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) &&
-         MODE_TREA == getCurrentOperationMode() )
+    if ( ( MODE_TREA == getCurrentOperationMode() ) &&
+       ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
+       ( AIR_TRAP_VALVE_OPEN_STATE == airTrapControllerState ) )
     {
         if ( ++airTrapUpperLevelCtr >= AIR_TRAP_UPPER_LEVEL_PERSISTENCE )
         {
@@ -385,13 +386,12 @@
     }
     else if ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
     {
-        if ( AIR_PUMP_STATE_ON == getAirPumpState())
+        if ( AIR_PUMP_STATE_ON == getAirPumpState() )
         {
             setAirPumpState( AIR_PUMP_STATE_OFF );
         }
     }
 
-
     return result;
 }