Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -r88b3f1f9ca21db9f584070b38acba76b959a68fb
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
@@ -1130,10 +1130,13 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( flushState != DG_FLUSH_STATE_CANCEL_WATER_PATH ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
     {
-        prevFlushState = flushState;
-        flushState     = DG_FLUSH_STATE_CANCEL_WATER_PATH;
+        if ( flushState != DG_FLUSH_STATE_CANCEL_WATER_PATH )
+        {
+            prevFlushState = flushState;
+            flushState     = DG_FLUSH_STATE_CANCEL_WATER_PATH;
+        }
     }
 }