Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r565ed0856be2fcf1443e3ec4cb8fe023b2c14db4 -r0589a145e2830f5e3b853489911a6ce7306ffdd9
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 565ed0856be2fcf1443e3ec4cb8fe023b2c14db4)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0589a145e2830f5e3b853489911a6ce7306ffdd9)
@@ -473,15 +473,20 @@
  *************************************************************************/
 static void transitionToPatientConnection( void )
 {
+    VALVE_T valve;
     setUFVolStatus = FALSE;
     patientConnectionConfirm = FALSE;
     treatmentStartRequested = FALSE;
 
-    cmdStartDGTrimmerHeater();
+    for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
+    {
+        setValvePosition( valve, VALVE_POSITION_C_CLOSE );
+    }
 
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    cmdStartDGTrimmerHeater();
 }
 
 /*********************************************************************//**
@@ -601,7 +606,8 @@
  * @brief
  * The handleInstallState function handles disposable installation.
  * @details Inputs: none
- * @details Outputs: transition to prime sub-mode when blood pump finished homing
+ * @details Outputs: transition to prime sub-mode when blood pump finished
+ * homing
  * @return current state (sub-mode)
  *************************************************************************/
 static HD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void )
@@ -659,7 +665,8 @@
 
 /*********************************************************************//**
  * @brief
- * The handlePrimeState function handles priming the blood and dialysate circuits.
+ * The handlePrimeState function handles priming the blood and dialysate
+ * circuits.
  * @details Inputs: none
  * @details Outputs: transition to self test wet state after priming passed
  * @return current state (sub-mode)