Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r782cbace651eebeccbbfd3e2f2b607436269ee7f -r88b3f1f9ca21db9f584070b38acba76b959a68fb
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 782cbace651eebeccbbfd3e2f2b607436269ee7f)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
@@ -1094,10 +1094,13 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
     {
-        prevChemDisinfectFlushState = chemDisinfectFlushState;
-        chemDisinfectFlushState     = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
+        if ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH )
+        {
+            prevChemDisinfectFlushState = chemDisinfectFlushState;
+            chemDisinfectFlushState     = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
+        }
     }
  }