Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc17d3d89bae686ff525a3fb9ed697c3d8107c275 -r037f0edb0b880130563058c809ba50308f2a63e9
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c17d3d89bae686ff525a3fb9ed697c3d8107c275)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 037f0edb0b880130563058c809ba50308f2a63e9)
@@ -212,14 +212,6 @@
         broadcastFilterFlushData( timeout, countdown );
     }
 
-    if ( TRUE == endSampleWaterRequest )
-    {
-        endSampleWaterRequest = FALSE;
-        setValveState( VPI, VALVE_STATE_CLOSED );
-        setValveState( VPD, VALVE_STATE_CLOSED );
-        state = DG_STANDBY_MODE_STATE_IDLE;
-    }
-
     return state;
 }
 
@@ -246,7 +238,6 @@
 
     if ( TRUE == endSampleWaterRequest )
     {
-        endSampleWaterRequest = FALSE;
         setValveState( VPI, VALVE_STATE_CLOSED );
 #ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
@@ -333,7 +324,7 @@
             break;
 
         case SAMPLE_WATER_CMD_END:
-            if ( DG_MODE_STAN == getCurrentOperationMode() )
+            if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) )
             {
                 endSampleWaterRequest = TRUE;
                 cmdResponse.rejected = FALSE;