Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -rcc067242d41776eb2a598212413e25df5a58b1fe
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision cc067242d41776eb2a598212413e25df5a58b1fe)
@@ -161,6 +161,19 @@
 
     cmdStopDGTrimmerHeater();
 
+    // Pumps should be off
+    signalBloodPumpHardStop();
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    stopSyringePump();
+
+    // 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 );
+
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
@@ -568,12 +581,18 @@
 {
     VALVE_T valve;
 
+    // Set valves
     for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
     {
         setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT );
     }
-
     setValveAirTrap( STATE_CLOSED );
+
+    // Pumps should be off
+    signalBloodPumpHardStop();
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    stopSyringePump();
 }
 
 /*********************************************************************//**