Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r603957e44fb094d75ad8ff59200df11bd96e6787 -rc0d44be16f9951cce2835bcc8b21820d1b88515e
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 603957e44fb094d75ad8ff59200df11bd96e6787)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision c0d44be16f9951cce2835bcc8b21820d1b88515e)
@@ -116,7 +116,7 @@
 
 static void failFlushMode( void );
 static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout );
-static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout );
+static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout, BOOL resetStateTimer );
 static void publishFlushData( void );
 static void monitorModeFlush( void );
 
@@ -339,7 +339,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -385,7 +385,7 @@
 
      if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
      {
-         rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+         rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, TRUE);
      }
      else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
      {
@@ -617,7 +617,7 @@
     // If reservoir 1 is empty, turn off the drain pump
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, FALSE);
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -859,7 +859,7 @@
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -876,7 +876,7 @@
     if ( ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status ) && ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status ) )
     {
         // If the cancellation water path cannot be done, go to basic cancellation path
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
@@ -988,7 +988,7 @@
  * then
  * @return the status of the reservoirs during draining
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout )
+static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout, BOOL resetStateTimer )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
 
@@ -1004,7 +1004,9 @@
     if ( TRUE == isDrainComplete )
     {
         // Set the state timer in case it needs to be used for another timeout check
-        stateTimerStart         = getMSTimerCount();
+        if (resetStateTimer)
+            stateTimerStart         = getMSTimerCount();
+
         haveDrainParamsBeenInit = FALSE;
         status                  = DG_RESERVOIR_REACHED_TARGET;
     }