Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -r8cebc7f282f403c99f712d422454c15414b6fc73
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8cebc7f282f403c99f712d422454c15414b6fc73)
@@ -113,6 +113,13 @@
     setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+
+    // Set valves to default positions
+    setValveAirTrap( STATE_CLOSED );
+    setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 }
 
 /*********************************************************************//**