Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rcac60091ce383940a5d83191c938e734929d5c28 -r7eb5bff2692849858ac28db1b440d403302ccfbc
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cac60091ce383940a5d83191c938e734929d5c28)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7eb5bff2692849858ac28db1b440d403302ccfbc)
@@ -511,7 +511,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 ) )
     {
@@ -529,6 +528,7 @@
         }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
+    syringePumpSetRate = 0.0;
 }
 
 /*********************************************************************//**