Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r782cbace651eebeccbbfd3e2f2b607436269ee7f -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 782cbace651eebeccbbfd3e2f2b607436269ee7f)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -1094,10 +1094,13 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
-        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;
+        }
     }
  }