Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rf116a1547129941d463b8fd156b550170a89e6a8 -r9d9654c846b21b8e09b0840097e5bf39d58e300f
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f116a1547129941d463b8fd156b550170a89e6a8)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9d9654c846b21b8e09b0840097e5bf39d58e300f)
@@ -937,13 +937,15 @@
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         signalDialInPumpHardStop();
-        cmdStopDGTrimmerHeater();
+        if ( TRUE == getTrimmerHeaterCommandedOn() )
+        {
+            cmdStopDGTrimmerHeater();
+        }
     }
     else if ( TRUE == alarmActionResumeReceived )
     {
         alarmActionResumeReceived = FALSE;
-        //setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialInPumpTargetFlowRate( 250, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); // TODO remove this line once the new flow control is implemented
+        setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         cmdStartDGTrimmerHeater();
     }