Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9e03fdc8048e93c5bf32372a9f951b4456d16392 -r58f4669e1c3992868dcd7bb219b5f760743466a0
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9e03fdc8048e93c5bf32372a9f951b4456d16392)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 58f4669e1c3992868dcd7bb219b5f760743466a0)
@@ -146,13 +146,17 @@
 *************************************************************************/
 void transitionToPreTreatmentMode( void )
 {
+    F32 const trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+    F32 const primaryHeaterTemp = trimmerHeaterTemp + PRIMARY_HEATER_TARGET_TEMP_OFFSET;
+
+    initPreTreatmentMode();
+    cmdSetDGDialysateTargetTemps( primaryHeaterTemp, trimmerHeaterTemp );
+    cmdStopDGTrimmerHeater();
+
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
-    initPreTreatmentMode();
-    cmdStopDGTrimmerHeater();
 }
 
 /*********************************************************************//**
@@ -518,11 +522,7 @@
             if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
             {
                 state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-                F32 const trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-                F32 const primaryHeaterTemp = trimmerHeaterTemp + PRIMARY_HEATER_TARGET_TEMP_OFFSET;
-
                 cmdStartDG();
-                cmdSetDGDialysateTargetTemps( primaryHeaterTemp, trimmerHeaterTemp );
                 transitionToConsumableSelfTest();
             }
             else