Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r4db653d58e037a678d3d45e1842959c10f6ead41
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 4db653d58e037a678d3d45e1842959c10f6ead41)
@@ -756,8 +756,9 @@
         setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
         setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
 
-        stateTimerStart = getMSTimerCount();
-        state           = DG_FLUSH_STATE_FLUSH_CIRCULATION;
+        hasFlushStatusBeenWrittenToNV = FALSE;
+        stateTimerStart               = getMSTimerCount();
+        state                         = DG_FLUSH_STATE_FLUSH_CIRCULATION;
     }
     else if ( TRUE == didTimeout( stateTimerStart, FLUSH_DRAIN_LINE_TIMEOUT_MS ) )
     {
@@ -933,9 +934,13 @@
 {
     DG_FLUSH_STATE_T state = DG_FLUSH_STATE_COMPLETE;
 
-    stopDGFlush();
     writeDisinfectDataToNV( USAGE_INFO_BASIC_FLUSH );
 
+    if ( TRUE == hasFlushStatusBeenWrittenToNV )
+    {
+        stopDGFlush();
+    }
+
     return state;
 }