Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r6df79a0e3853c72bf1c21c9959a7477df4945183 -rbe920d1ab62ea8520093c7c0ab44eba31faea429
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 6df79a0e3853c72bf1c21c9959a7477df4945183)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision be920d1ab62ea8520093c7c0ab44eba31faea429)
@@ -849,7 +849,7 @@
  * @details Inputs: rsrvr1Status, rsrvr2Status, stateTimer,
  * hasWaterCancellationBeenSet
  * @details Outputs: rsrvr1Status, rsrvr2Status, stateTimer,
- * hasWaterCancellationBeenSet
+ * hasWaterCancellationBeenSet, haveDrainParamsBeenInit
  * @return next state of the flush state machine
  *************************************************************************/
 static DG_FLUSH_STATE_T handleFlushModeCancelWaterPathState( void )
@@ -868,8 +868,10 @@
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
 
         // Set both reservoirs to be considered as full
-        rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-        rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+        rsrvr1Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr2Status                              = DG_RESERVOIR_ABOVE_TARGET;
 
         // Water cancellation path was set
         hasWaterCancellationBeenSet = TRUE;