Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r03efe69734fc9539f4198ddba6f93614ea08ea7c -r120c1e4267461f1fab53f34b4947ef0ec5f2aa80
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 03efe69734fc9539f4198ddba6f93614ea08ea7c)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 120c1e4267461f1fab53f34b4947ef0ec5f2aa80)
@@ -511,11 +511,11 @@
  *************************************************************************/
 void stopSyringePump( void )
 {
-    syringePumpSetRate = 0.0;
     setFPGASyringePumpStepToggleTime( SYRINGE_PUMP_MICROSTEP_TOGGLE_TIME_FOR_STOP );
     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 ) )
     {
@@ -528,6 +528,7 @@
             sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        syringePumpSetRate = 0.0;
     }
 }