Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -rfafeb76a9e02672f4a03bc8c35a2b09950ff736f
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision fafeb76a9e02672f4a03bc8c35a2b09950ff736f)
@@ -771,15 +771,19 @@
     {
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-            // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
-            // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
-            heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
-            heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
-            alarmDetectedPendingTrigger      = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
-
-            if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+            if ( ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE ) &&
+                 ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE ) )
             {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
+                // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
+                heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
+                heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
+                alarmDetectedPendingTrigger      = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+                if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                }
             }
         }
     }