Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -r83a8a0e1e8630939e6a173f1313cceb7f39e00dd
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 83a8a0e1e8630939e6a173f1313cceb7f39e00dd)
@@ -165,6 +165,19 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
+    // Pumps should be off
+    signalBloodPumpHardStop();
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    stopSyringePump();
+
+    // Set valves to default positions
+    setValveAirTrap( STATE_CLOSED );
+    setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+
     resetPrimeFlags();
 }