Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -raa4db7d76566ad7473f896e543f71fdbbc921ea9
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision aa4db7d76566ad7473f896e543f71fdbbc921ea9)
@@ -248,22 +248,13 @@
     // 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 not done with bolus, start/resume bolus
-        if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+        if ( hepRate > 0.0 )
         {
-            startHeparinBolus();  // TODO - check return status or have function trigger alarm if not successful
+            startHeparinContinuous();  // TODO - check return status
         }
-        // Otherwise, start/resume continuous delivery
         else
         {
-            if ( hepRate > 0.0 )
-            {
-                startHeparinContinuous();  // TODO - check return status
-            }
-            else
-            {
-                setHeparinCompleted();
-            }
+           setHeparinCompleted();
         }
     }
     else