Index: firmware/App/Services/StateServices/TubeSetInstall.c
===================================================================
diff -u -r06462a7f903d6ac4835125746b6b6394be4601ae -r593393009f0796d971fd90ce072bee561109debc
--- firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 06462a7f903d6ac4835125746b6b6394be4601ae)
+++ firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 593393009f0796d971fd90ce072bee561109debc)
@@ -141,11 +141,24 @@
 static TUBE_SET_INSTALL_STATE_T handleAwaitTubesetConfirmationState( void )
 {
     TUBE_SET_INSTALL_STATE_T state = TUBE_SET_INSTALL_STATE_AWAIT_TUBE_SET_CONFIRMATION;
+    F32 bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR;
 
     if ( TRUE == confirmTubesetPlaced )
     {
         // Door closed required from Auto-loading onwards, set to false if not required in subsequent states
         doorClosedRequired( TRUE );
+
+        // Request DD to generate dialysate with Qd = 600 mL/min,
+        // Quf = 0, and dialyzer bypassed.
+        cmdStartGenerateDialysate( 600.0F,
+                                   0.0F,
+                                   getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ),
+                                   TRUE,
+                                   getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
+                                   bicarbConvFactor,
+                                   getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
+                                   getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
+
         confirmTubesetPlaced = FALSE;
         state                = TUBE_SET_INSTALL_STATE_AWAIT_BP_DOOR_CLOSE;
     }
@@ -241,23 +254,11 @@
 static TUBE_SET_INSTALL_STATE_T handleAwaitSetupConnectionConfirmationState( void )
 {
     TUBE_SET_INSTALL_STATE_T state = TUBE_SET_INSTALL_STATE_AWAIT_SETUP_CONNECTION_CONFIRMATION;
-    F32 bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR;
 
     if ( TRUE == setupConnectionsConfirmed )
     {
         setupConnectionsConfirmed = FALSE;
 
-        // Request DD to generate dialysate with Qd = 600 mL/min,
-        // Quf = 0, and dialyzer bypassed.
-        cmdStartGenerateDialysate( 600.0F,
-                                   0.0F,
-                                   getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ),
-                                   TRUE,
-                                   getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
-                                   bicarbConvFactor,
-                                   getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
-                                   getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
-
         state = TUBE_SET_INSTALL_STATE_COMPLETE;
     }