Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r4d509fa074423027c3106a209ead0beffd57cc3e -r5ea6a78b3576e7f6b456843b31877101f55a7dc3
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 4d509fa074423027c3106a209ead0beffd57cc3e)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5ea6a78b3576e7f6b456843b31877101f55a7dc3)
@@ -277,11 +277,12 @@
     F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
     // Do not run syringe pump if no Heparin included in prescription or it was paused or if Heparin should be stopped at this stage of treatment
-    if ( ( minRem > (F32)preStop ) && ( HEPARIN_STATE_STOPPED == currentHeparinState ) )
+    if ( ( minRem > (F32)preStop ) &&
+         ( ( HEPARIN_STATE_STOPPED == currentHeparinState ) || ( HEPARIN_STATE_DISPENSING == currentHeparinState ) ) )
     {
         if ( hepRate > 0.0 )
         {
-            startHeparinContinuous();  // TODO - check return status
+            startHeparinContinuous();
         }
         else
         {