Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r83464d0f103745e998abdb187c9f52532b783647 -r67697eb4ca0296ad472b19b4534bea0aea1e759a
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 83464d0f103745e998abdb187c9f52532b783647)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 67697eb4ca0296ad472b19b4534bea0aea1e759a)
@@ -514,7 +514,6 @@
  *************************************************************************/
 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 ) )
     {
@@ -532,6 +531,7 @@
         }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
+    syringePumpSetRate = 0.0;
 }
 
 /*********************************************************************//**