Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r2b47dd2e7974618d8899527cdbff80fa93ebc9fa -r2903779754f98d014dacdf075099912ad7830ce6
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 2b47dd2e7974618d8899527cdbff80fa93ebc9fa)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 2903779754f98d014dacdf075099912ad7830ce6)
@@ -891,7 +891,10 @@
 
     writeDisinfectDataToNV( USAGE_INFO_CHEM_FLUSH );
 
-    stopChemicalDisinfectFlush();
+    if ( TRUE == disinfectNVOps.hasDisStatusBeenWrittenToNV )
+    {
+        stopChemicalDisinfectFlush();
+    }
 
     return state;
 }