Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r39c83612c7d83075cded8b7e1c8030898cdb5ad9 -r0accd811fd2db649fe15ca85e1ad6614efa8ba51
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 39c83612c7d83075cded8b7e1c8030898cdb5ad9)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 0accd811fd2db649fe15ca85e1ad6614efa8ba51)
@@ -741,7 +741,7 @@
  * state.
  * @details Inputs: stateTimer, hasAlarmBeenTriggered
  * @details Outputs: stateTimer, hasAlarmBeenTriggered, rsrvr1Status,
- * isThisLastDrain
+ * isThisLastDrain, alarmDetectedPendingTrigger, prevChemDisinfectFlushState
  * @return next state of the chemical disinfect flush state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_FLUSH_STATE_T handleChemicalDisinfectFlushSampleFlushR1ToR2DrainR2State( void )
@@ -785,8 +785,9 @@
 
     if ( TRUE == didTimeout( stateTimer, SAMPLE_FLUSH_WAIT_STATE_TIMEOUT_MS ) )
     {
-        activateAlarmNoData( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT );
-        state = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
+        alarmDetectedPendingTrigger = ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT;
+        prevChemDisinfectFlushState = state;
+        state                       = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
     }
 
     return state;
Index: firmware/App/Modes/ModeROPermeateSample.c
===================================================================
diff -u -re2406180bf569fb495b709542c12da099c8e23ea -r0accd811fd2db649fe15ca85e1ad6614efa8ba51
--- firmware/App/Modes/ModeROPermeateSample.c	(.../ModeROPermeateSample.c)	(revision e2406180bf569fb495b709542c12da099c8e23ea)
+++ firmware/App/Modes/ModeROPermeateSample.c	(.../ModeROPermeateSample.c)	(revision 0accd811fd2db649fe15ca85e1ad6614efa8ba51)
@@ -748,7 +748,8 @@
             // Drain pump
             setDrainPumpTargetRPM( RSRVR_DRAIN_TARGET_RPM );
             // Variables
-            stateStartTimeMS = getMSTimerCount();
+            rsrvrsStatus.rsrvr[ DG_RESERVOIR_1 ].rStatus = DG_RESERVOIR_ABOVE_TARGET;
+            stateStartTimeMS                             = getMSTimerCount();
             break;
 
         case DG_RO_PERM_SAMPLE_STATE_DRAIN_R2: