Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r1cff40f532b0cbdb367c519f063cad1dccc5264c -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 1cff40f532b0cbdb367c519f063cad1dccc5264c)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2022-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2022-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeChemicalDisinfectFlush.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      16-Aug-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  15-Nov-2022
@@ -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 );
@@ -1043,7 +1045,9 @@
         // If either the dialysate cap or the concentrate cap is open during any state, alarm
         if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == dialysateCap ) )
         {
-            if ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_START )
+            if ( ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_START ) &&
+                 ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH ) &&
+                 ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH ) )
             {
                 prevChemDisinfectFlushState = chemDisinfectFlushState;
                 chemDisinfectFlushState     = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;