Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9d924ec76ce770eb2a94088bfe37bfb0e30981a8 -r8036381b5c41ab87146c929eeeb9ba073efd4541
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9d924ec76ce770eb2a94088bfe37bfb0e30981a8)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8036381b5c41ab87146c929eeeb9ba073efd4541)
@@ -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();
     }