Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -ra5b84c018934c938b28c9b6671a6ae842f899e19 -rf373b6c38077c7e6071939e702fab65db58c1146
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision a5b84c018934c938b28c9b6671a6ae842f899e19)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision f373b6c38077c7e6071939e702fab65db58c1146)
@@ -45,6 +45,7 @@
 #define DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN          200                     ///< Default rinseback flow rate (in mL/min).
 #define MIN_RINSEBACK_FLOW_RATE_ML_MIN              100                     ///< Minimum rinseback flow rate (in mL/min).
 #define MAX_RINSEBACK_FLOW_RATE_ML_MIN              300                     ///< Maximum rinseback flow rate (in mL/min).
+#define DEFAULT_FILL_RESERVOIR_TO_VOLUME_ML         1500                    ///< default Fill reservoir to this volume (in mL).
 
 /// Interval at which rinseback progress is to be published to UI.
 #define RINSEBACK_DATA_PUBLISH_INTERVAL             ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
@@ -188,14 +189,17 @@
     stopSyringePump();
     endAirTrapControl();
 
-    // if DG restarted for some reason, lets make sure we set the heating parameters first before commanding to
+    // If DG restarted for some reason, lets make sure we set the heating parameters first before commanding to
     // turn on the trimmer heater and start the DG as well.
     if ( DG_MODE_STAN == getDGOpMode() )
     {
-        // set the trimmer heating parameters
-        setDefaultTreatmentHeatingParams();
+        F32 targetTempC       = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+        U32 dialysateFlowMLPM = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
 
-        // start the DG
+        // Set the heating parameters
+        setPreTreatmentHeatingParams( targetTempC, DEFAULT_FILL_RESERVOIR_TO_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM, dialysateFlowMLPM );
+
+        // Start the DG
         cmdStartDG();
     }