Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rd32472915764d90215349c396ef6ab6a5db984d1 -r8f5a1b18748e7461bb657ef72ab6d5f77e1532b8
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision d32472915764d90215349c396ef6ab6a5db984d1)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 8f5a1b18748e7461bb657ef72ab6d5f77e1532b8)
@@ -559,6 +559,7 @@
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
+        setValveState( VRD1, VALVE_STATE_CLOSED );
         prevChemDisinfectState = state;
         state                  = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
     }
@@ -840,7 +841,7 @@
  * to another state. If the minimum conductivity and temperature are not
  * reached within the defined period of time, it transition to a cancellation path.
  * @details Inputs: stateTimer, primeAcidSteadyStateCounter,
- * temperature, conductivity
+ * temperature, conductivity, disinfectNVOps
  * @details Outputs: stateTimer, prevChemDisinfectState, alarm
  * @return next state of the chemical disinfect state machine
  *************************************************************************/
@@ -877,13 +878,14 @@
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD1, VALVE_STATE_CLOSED );
             setValveState( VRD2, VALVE_STATE_CLOSED );
-            rsrvr1Status                   = DG_RESERVOIR_BELOW_TARGET;
-            rsrvr2Status                   = DG_RESERVOIR_BELOW_TARGET;
-            chemDisinfectReservoirTime     = 0;
-            rsrvrFillStableTimeCounter     = 0;
-            isChemDisinfectTempAboveTarget = FALSE;
-            stateTimer                     = getMSTimerCount();
-            state                          = DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT;
+            rsrvr1Status                               = DG_RESERVOIR_BELOW_TARGET;
+            rsrvr2Status                               = DG_RESERVOIR_BELOW_TARGET;
+            chemDisinfectReservoirTime                 = 0;
+            rsrvrFillStableTimeCounter                 = 0;
+            isChemDisinfectTempAboveTarget             = FALSE;
+            stateTimer                                 = getMSTimerCount();
+            disinfectNVOps.hasDisStatusBeenWrittenToNV = FALSE;
+            state                                      = DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT;
         }
     }
 
@@ -1235,12 +1237,10 @@
         cancellationMode = CANCELLATION_MODE_WATER;
         rsrvr1Status     = DG_RESERVOIR_ABOVE_TARGET;
         rsrvr2Status     = DG_RESERVOIR_ABOVE_TARGET;
+        stateTimer       = getMSTimerCount();
         // The drain is set to start from reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
-
-        // Start the timer for drain timeout
-        stateTimer = getMSTimerCount();
     }
 
     // If reservoir 2 is empty, set to drain reservoir 1