Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rc39ed7a93d564db5ba2de199799b69ee308ad008 -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c39ed7a93d564db5ba2de199799b69ee308ad008)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-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    ModeChemicalDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Oct-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -1784,17 +1784,20 @@
         if ( ( ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) ) ) &&
              ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
-            prevChemDisinfectState = chemDisinfectState;
-            chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
-
-            if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
+            if ( ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH ) )
             {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                prevChemDisinfectState = chemDisinfectState;
+                chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+
+                if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                }
+                if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+                }
             }
-            if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
-            {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
-            }
         }
     }