Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r75868c86d86060f8ec8fde969a479e186e51d9a0 -r9e7b4f8ffe2a0d86e077a89417ef396a3bc86c6d
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 75868c86d86060f8ec8fde969a479e186e51d9a0)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9e7b4f8ffe2a0d86e077a89417ef396a3bc86c6d)
@@ -724,6 +724,7 @@
         }
         else
         {
+            setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
             // Number of rinse cycles complete
             stateTimer = getMSTimerCount();
             state      = DG_CHEM_DISINFECT_FLUSH_STATE_SAMPLE_FLUSH_R1_TO_R2_DRAIN_R2;
@@ -750,7 +751,6 @@
     if ( ( TRUE == didTimeout( stateTimer, SAMPLE_FLUSH_WAIT_TIME_MS ) ) && ( FALSE == hasAlarmBeenTriggered ) )
     {
         hasAlarmBeenTriggered = TRUE;
-        setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
         activateAlarmNoData( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE );
     }