Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -rcd872cad75ebc844eee95f4a14904a269c544bbc
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision cd872cad75ebc844eee95f4a14904a269c544bbc)
@@ -1672,12 +1672,19 @@
     if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE ) && ( NELSON_NONE == nelsonSupport ) )
 #endif
     {
-        // If the dialysate 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 dialysate port and hit ok
-        if ( ( STATE_CLOSED == getSwitchStatus( DIALYSATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
+        // 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 ) )
         {
             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;
         }
     }