Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rfe247cc3f8cd5dee625c3e23b20e2ffa7ba6d7fd -raa53e5f659cb10d84f98165ffcdf88fcf8d4efa2
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision fe247cc3f8cd5dee625c3e23b20e2ffa7ba6d7fd)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision aa53e5f659cb10d84f98165ffcdf88fcf8d4efa2)
@@ -386,6 +386,17 @@
     else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
             ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) )
     {
+#ifndef _RELEASE_
+        if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
+#endif
+        {
+            if ( AIR_PUMP_STATE_ON == getAirPumpState() )
+            {
+                setAirPumpState( AIR_PUMP_STATE_OFF );
+                airPumpUpperLevelCtr = 0;
+            }
+        }
+
         setValveAirTrap( STATE_OPEN );
         fillStartTime = getMSTimerCount();
         result = AIR_TRAP_VALVE_OPEN_STATE;