Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r31b1a66bc92068f86ff154e63d8cf9393d65258f -r638b779e225a66a1fecac6ea8679ca9c0f31f537
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 31b1a66bc92068f86ff154e63d8cf9393d65258f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 638b779e225a66a1fecac6ea8679ca9c0f31f537)
@@ -446,8 +446,11 @@
                 signalBloodPumpHardStop();
                 stopSyringePump();
 
-                // Set valves to safe positions
-                setValveAirTrap( STATE_CLOSED );
+                // Set air trap valves to safe positions
+                set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+                set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+
+                // Set pinch valves to safe positions
                 setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
                 setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
             }