Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -rfe247cc3f8cd5dee625c3e23b20e2ffa7ba6d7fd
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision fe247cc3f8cd5dee625c3e23b20e2ffa7ba6d7fd)
@@ -361,7 +361,8 @@
         }
     }
 
-    else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
+    else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
+            ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) )
     {
 
 #ifndef _RELEASE_
@@ -372,7 +373,6 @@
             {
                 airPumpUpperLevelCtr++;
                 // Turn air pump off once we detect air at upper level and exceed persistence
-                // But first, open the air valve.
                 if ( airPumpUpperLevelCtr >= AIR_PUMP_UPPER_LEVEL_PERSISTENCE )
                 {
                     setAirPumpState( AIR_PUMP_STATE_OFF );
@@ -383,18 +383,9 @@
     }
 
     // Transition to open valve state when air detected at lower level
-    else if ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
+    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;