Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r1cf11f4c1f6a1f1fd40270889723fbec040fc7ec
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1cf11f4c1f6a1f1fd40270889723fbec040fc7ec)
@@ -15,13 +15,16 @@
 *
 ***************************************************************************/
 
+#include "BoostPump.h"
 #include "ModePreGenPermeateDefeatured.h"
 #include "ModePreGenPermeate.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "ROPump.h"
 #include "SystemCommFP.h"
 #include "TaskGeneral.h"
+#include "Valves.h"
 
 /**
  *  @addtogroup FPStandbyMode
@@ -63,6 +66,24 @@
 {
     initStandbyMode();
 
+    setValveState( M4_VALV,VALVE_STATE_CLOSED );
+    setValveState( P6_VALV,VALVE_STATE_CLOSED );
+    setValveState( P11_VALV,VALVE_STATE_CLOSED );
+    setValveState( P33_VALV, VALVE_STATE_CLOSED );
+    setValveState( P34_VALV,VALVE_STATE_CLOSED );
+    setValveState( P37_VALV, VALVE_STATE_CLOSED );
+    setValveState( P39_VALV,VALVE_STATE_CLOSED );
+    setValveState( M7_VALV, VALVE_STATE_CLOSED );
+    setValveState( P20_VALV,VALVE_STATE_CLOSED );
+
+    signalROPumpHardStop();
+
+    if ( TRUE == isBoostPumpInstalled() )
+    {
+        signalBoostPumpHardStop();
+    }
+
+
     return standbyState;
 }