Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r8ebab816fadec93b2f3c6a42f15a07c26b3a4f59 -r213c09d4f8c37e562611df2539f73ffaea022f83
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8ebab816fadec93b2f3c6a42f15a07c26b3a4f59)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 213c09d4f8c37e562611df2539f73ffaea022f83)
@@ -1467,7 +1467,8 @@
  * If the drain is completed within the define time, it transitions to the
  * complete state.
  * @details Inputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
- * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
+ * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer,
+ * haveDrainParamsBeenInit
  * @return next state of the heat disinfect state machine
  *************************************************************************/
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCancelModeWaterPathState( void )
@@ -1503,16 +1504,17 @@
             cancellationMode = CANCELLATION_MODE_HOT;
         }
 
-        rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-        rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr1Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr2Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+        stateTimer                                = getMSTimerCount();
 
         // 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 );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setDrainPumpTargetRPM( targetRPM );
-
-        // Start the timer for drain timeout
-        stateTimer = getMSTimerCount();
     }
 
     // If reservoir 2 is empty, set to drain reservoir 1