Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rd32f890bb6c238c95bcaca54da79d7aa4a1898cb -rbe920d1ab62ea8520093c7c0ab44eba31faea429
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision d32f890bb6c238c95bcaca54da79d7aa4a1898cb)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision be920d1ab62ea8520093c7c0ab44eba31faea429)
@@ -1254,7 +1254,8 @@
  * chemical disinfect cancel mode cold water path state. It drains the reservoirs
  * before the cancel basic path mode is entered.
  * @details Inputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
- * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
+ * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer,
+ * haveDrainParamsBeenInit
  * @return next state of the chemical disinfect state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeWaterPathState( void )
@@ -1266,10 +1267,12 @@
         // Stop all the actuators first then decide who should run next
         deenergizeActuators( NO_PARK_CONC_PUMPS );
 
-        cancellationMode = CANCELLATION_MODE_WATER;
-        rsrvr1Status     = DG_RESERVOIR_ABOVE_TARGET;
-        rsrvr2Status     = DG_RESERVOIR_ABOVE_TARGET;
-        stateTimer       = getMSTimerCount();
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+        cancellationMode                          = CANCELLATION_MODE_WATER;
+        rsrvr1Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr2Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        stateTimer                                = getMSTimerCount();
         // The drain is set to start from reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );