Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r8ebab816fadec93b2f3c6a42f15a07c26b3a4f59 -r2bb516790e85b97d633520730651926e12c9f45b
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8ebab816fadec93b2f3c6a42f15a07c26b3a4f59)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2bb516790e85b97d633520730651926e12c9f45b)
@@ -1505,14 +1505,13 @@
 
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
         rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ]  = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]  = FALSE;
 
         // The drain is set to start from reservoir 2 since all the actuators have been de-energized
         // Set the drain valve to reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
         setDrainPumpTargetRPM( targetRPM );
-
-        // Start the timer for drain timeout
-        stateTimer = getMSTimerCount();
     }
 
     // If reservoir 2 is empty, set to drain reservoir 1
@@ -1526,6 +1525,9 @@
             // Set the drain valve to reservoir 1 and close reservoir 2
             setValveState( VRD1, VALVE_STATE_OPEN );
             setValveState( VRD2, VALVE_STATE_CLOSED );
+
+            // Start the timer for drain timeout
+            stateTimer = getMSTimerCount();
         }
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )