Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r4f4bccce63b697cbf78cfcb104658e028be252d3 -rf14422a7576bf3c44d8fa23d8a14b6cab1922553
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 4f4bccce63b697cbf78cfcb104658e028be252d3)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision f14422a7576bf3c44d8fa23d8a14b6cab1922553)
@@ -198,6 +198,7 @@
 static void setupForRecoverBloodDetectState( void )
 {
     doorClosedRequired( TRUE, TRUE );
+    cmdStopDGTrimmerHeater();
     setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_BLOOD_DETECT_RECOVERY_MLPM, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
 }
 
@@ -429,11 +430,6 @@
     handleTreatmentStopBloodSittingTimer();
     result = handleTreatmentStopAlarmsAndSignals( result );
 
-    if ( isAlarmActive( ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT ) != TRUE )
-    {
-        enterBloodLeakNormalState();
-    }
-
     return result;
 }