Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r1223d5caafbd260f9a62e922cbf54165b1254ff9 -rd626b122c5c247c01557038a49804cc3da237f93
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1223d5caafbd260f9a62e922cbf54165b1254ff9)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d626b122c5c247c01557038a49804cc3da237f93)
@@ -860,13 +860,10 @@
     {
         salineBolusStartRequested = FALSE;
         // Cmd all pumps to stop
-        stopDialysis();
-/*
- *       setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
- *       setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
- *       setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
- *       stopSyringePump();
- */
+        setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        stopSyringePump();
         // Begin saline bolus
         result = SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP;
     }
@@ -967,6 +964,8 @@
         // Hard stop blood and dialysate pumps
         signalBloodPumpHardStop();
         signalDialInPumpHardStop();
+        // Tell DG to stop heating dialysate
+        cmdStopDGTrimmerHeater();
         // Send last saline bolus data
         salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL;
         publishSalineBolusData();