Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rbe920d1ab62ea8520093c7c0ab44eba31faea429 -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision be920d1ab62ea8520093c7c0ab44eba31faea429)
+++ 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)      03-Oct-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  15-Nov-2022
@@ -1045,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;