Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -raa53e5f659cb10d84f98165ffcdf88fcf8d4efa2 -r91d34f09aba75c8a7da63577ec5775938c2d6e77
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision aa53e5f659cb10d84f98165ffcdf88fcf8d4efa2)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 91d34f09aba75c8a7da63577ec5775938c2d6e77)
@@ -345,6 +345,12 @@
     {
         pendingStopAirTrapController = FALSE;
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
+
+        if ( AIR_PUMP_STATE_ON == getAirPumpState() )
+        {
+            setAirPumpState( AIR_PUMP_STATE_OFF );
+            airPumpUpperLevelCtr = 0;
+        }
     }
 
     //Turn on air pump if fluid reaches upper level.
@@ -357,6 +363,7 @@
             if ( AIR_PUMP_STATE_OFF == getAirPumpState() )
             {
                 setAirPumpState( AIR_PUMP_STATE_ON );
+                airPumpUpperLevelCtr = 0;
             }
         }
     }
@@ -376,7 +383,6 @@
                 if ( airPumpUpperLevelCtr >= AIR_PUMP_UPPER_LEVEL_PERSISTENCE )
                 {
                     setAirPumpState( AIR_PUMP_STATE_OFF );
-                    airPumpUpperLevelCtr = 0;
                 }
             }
         }
@@ -393,7 +399,6 @@
             if ( AIR_PUMP_STATE_ON == getAirPumpState() )
             {
                 setAirPumpState( AIR_PUMP_STATE_OFF );
-                airPumpUpperLevelCtr = 0;
             }
         }