Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -8,7 +8,7 @@
 * @file    ModeHeatDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      17-May-2023
+* @date    (last)      31-May-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -1370,6 +1370,7 @@
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         // Turn on the drain pump to drain the reservoirs in open loop mode
         setDrainPumpTargetRPM( DRAIN_PUMP_RPM_IN_MIX_DRAIN );
+        turnOnUVReactor( INLET_UV_REACTOR );
     }
     else if ( TRUE == isDrainPumpInMixDrainOn )
     {
@@ -1975,10 +1976,13 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
-        prevHeatDisinfectState = heatDisinfectState;
-        heatDisinfectState     = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        if ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH )
+        {
+            prevHeatDisinfectState = heatDisinfectState;
+            heatDisinfectState     = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
     }
 }