Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rbccdf42b4195cd774760bc75dc21ab78727f9a4a -rb89d157b56dce2daf63f4a9e9df9ef6636f2bf44
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b89d157b56dce2daf63f4a9e9df9ef6636f2bf44)
@@ -450,9 +450,11 @@
         set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
+    // TODO investigate the timeout
     // Transition back to closed state when air trap lower level operation completed when air detected at upper level
-    else if ( ( TRUE == didTimeout( airTrapLowerStartTime, airPumpStopTime ) ) ||
-              ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( H16_LEVL ) ) )
+    //else if ( ( TRUE == didTimeout( airTrapLowerStartTime, airPumpStopTime ) ) ||
+    //          ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( H16_LEVL ) ) )
+    else if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) )
     {
         setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
         set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );