Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -ref8f8acf97c6dff4b1f4be470a57940eeda8d5fb -r3ac401229380733eaf40969842c937fa6c6f0573
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision ef8f8acf97c6dff4b1f4be470a57940eeda8d5fb)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 3ac401229380733eaf40969842c937fa6c6f0573)
@@ -404,9 +404,11 @@
     }
 
     // Turn air pump off after defined time or air detected at upper level
-    else if ( ( TRUE == didTimeout( stopAirPumpStartTime, AIR_PUMP_ON_STOP_TIME_MS ) ) ||
+    else if ( ( ( AIR_PUMP_STATE_ON == getAirPumpState() ) &&
+                ( TRUE == didTimeout( stopAirPumpStartTime, AIR_PUMP_ON_STOP_TIME_MS ) ) ) ||
               ( ( AIR_TRAP_LEVEL_AIR   == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
                 ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) ) )
+
     {
         if ( AIR_PUMP_STATE_ON == getAirPumpState() )
         {