Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -rbc2f07d1ccac37e4cb18a21bfe096db94e72a151 -r88b3f1f9ca21db9f584070b38acba76b959a68fb
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision bc2f07d1ccac37e4cb18a21bfe096db94e72a151)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
@@ -782,11 +782,14 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
     {
-        // If there is any fault alarm and we are not already in the cancel water path state, set it to cancel water path state
-        heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
-        heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
+        if ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE )
+        {
+            // If there is any fault alarm and we are not already in the cancel water path state, set it to cancel water path state
+            heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
+            heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
+        }
     }
 }