Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -rfafeb76a9e02672f4a03bc8c35a2b09950ff736f
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision fafeb76a9e02672f4a03bc8c35a2b09950ff736f)
@@ -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;
-            }
         }
     }