Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r782cbace651eebeccbbfd3e2f2b607436269ee7f -r88b3f1f9ca21db9f584070b38acba76b959a68fb
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 782cbace651eebeccbbfd3e2f2b607436269ee7f)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
@@ -1726,10 +1726,13 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
     {
-        prevChemDisinfectState = chemDisinfectState;
-        chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+        if ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH )
+        {
+            prevChemDisinfectState = chemDisinfectState;
+            chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
     }
 }