Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rf5d8da2ffed2cb22132c791039ba8a1221e31223 -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision f5d8da2ffed2cb22132c791039ba8a1221e31223)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
@@ -8,7 +8,7 @@
 * @file    ModeHeatDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      14-Oct-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -1442,21 +1442,12 @@
     if ( TRUE == setActuatorsPriorToTransition )
     {
         signalROPumpHardStop();
-
-        if ( TRUE == isDrainPumpOn() )
-        {
-            // Stop the drain pump and the RO pump to exit the closed loop
-            signalDrainPumpHardStop();
-            setValveState( VRD1, VALVE_STATE_CLOSED );
-        }
-        else
-        {
-            setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
-            setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
-            rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-            stateTimer   = getMSTimerCount();
-            state        = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
-        }
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
+        rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
+        stateTimer   = getMSTimerCount();
+        state        = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
     }
 
     return state;
@@ -2111,15 +2102,18 @@
     {
         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
-            prevHeatDisinfectState      = heatDisinfectState;
-            heatDisinfectState          = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
-
-            if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+            if ( ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH ) && ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH ) )
             {
-                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
+                prevHeatDisinfectState      = heatDisinfectState;
+                heatDisinfectState          = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+                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;
+                }
             }
         }
     }