Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r31b1a66bc92068f86ff154e63d8cf9393d65258f -r5b3f0d8e659384a1c13b164a47ee66e4eb76cae4
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 31b1a66bc92068f86ff154e63d8cf9393d65258f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5b3f0d8e659384a1c13b164a47ee66e4eb76cae4)
@@ -26,6 +26,7 @@
 #include "OperationModes.h"
 #include "PinchValve.h"
 #include "Switches.h"
+#include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "TxParams.h"
 #include "Valve3Way.h"
@@ -50,7 +51,6 @@
 static FLUID_TYPE_T fluidType;                                                                 ///< Fluid type assigned based on user selection.
 static TREATMENT_TYPE_T modality;                                                              ///< Modality from the treatment initiation.
 
-
 // ********** private function prototypes **********
 
 static TD_STANDBY_STATE_T handleStandbyModeStartState( void );
@@ -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 );
             }