Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r713052663335c4402f29a87853802c1b7db0d583 -rc54e9565dd57de961ab6533b0af803df698f7a1d
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 713052663335c4402f29a87853802c1b7db0d583)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c54e9565dd57de961ab6533b0af803df698f7a1d)
@@ -1682,18 +1682,20 @@
     {
         // If the concentrate cap is closed during any state other the start state, alarm. In start state we are still looking for
         // the user to insert the acid into the concentrate port and hit ok
-        if ( ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
+        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;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
-        }
 
-        if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
-        {
-            prevChemDisinfectState      = chemDisinfectState;
-            chemDisinfectState          = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+            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;
+            }
         }
     }