Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rd32f890bb6c238c95bcaca54da79d7aa4a1898cb -rbe920d1ab62ea8520093c7c0ab44eba31faea429
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision d32f890bb6c238c95bcaca54da79d7aa4a1898cb)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision be920d1ab62ea8520093c7c0ab44eba31faea429)
@@ -780,7 +780,7 @@
  * chemical disinfect flush cancel mode water path state.
  * @details Inputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
  * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer,
- * ChemDisinfectFlushUIState
+ * ChemDisinfectFlushUIState, haveDrainParamsBeenInit
  * @return next state of the chemical disinfect flush state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_FLUSH_STATE_T handleChemicalDisinfectFlushCancelModeWaterPathState( void )
@@ -794,9 +794,11 @@
         // 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;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+        cancellationMode                          = CANCELLATION_MODE_WATER;
+        rsrvr1Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr2Status                              = DG_RESERVOIR_ABOVE_TARGET;
 
         // The drain is set to start from reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );