Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r67697eb4ca0296ad472b19b4534bea0aea1e759a -rc8087014b4cc3b13f146d7d6b05faad70e48d663
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 67697eb4ca0296ad472b19b4534bea0aea1e759a)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c8087014b4cc3b13f146d7d6b05faad70e48d663)
@@ -518,6 +518,7 @@
     if ( ( syringePumpState != SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE ) && ( syringePumpState != SYRINGE_PUMP_OFF_STATE ) )
     {
         syringePumpState = SYRINGE_PUMP_OFF_STATE;
+        syringePumpSetRate = 0.0;
     }
     if ( ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState ) || ( HEPARIN_STATE_DISPENSING == heparinDeliveryState ) )
     {
@@ -530,6 +531,7 @@
             sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        syringePumpSetRate = 0.0;
     }
     syringePumpSetRate = 0.0;
 }