Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -re2dc5254fd0a36724e817d27a21297e9f78ce4fd -rca8d99e25bf12144593d4f9dcfab9f1564269ef0
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e2dc5254fd0a36724e817d27a21297e9f78ce4fd)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision ca8d99e25bf12144593d4f9dcfab9f1564269ef0)
@@ -464,9 +464,10 @@
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
     // Transition to closed valve state when fluid detected at upper level
-    else if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
+    else if ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
         setValveAirTrap( STATE_CLOSED );
+        airPumpOnDelayStartTime = getMSTimerCount();
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
     return result;