Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rb3a7b408db8f17514fbd013ad19722e0efed6094 -r7de21ac8b699cafdfeaefbf2c062c3e21bcc956d
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision b3a7b408db8f17514fbd013ad19722e0efed6094)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7de21ac8b699cafdfeaefbf2c062c3e21bcc956d)
@@ -481,7 +481,10 @@
 {
     syringePumpSetRate = 0.0;
     setFPGASyringePumpStepToggleTime( SYRINGE_PUMP_MICROSTEP_TOGGLE_TIME_FOR_STOP );
-    syringePumpState = SYRINGE_PUMP_OFF_STATE;
+    if ( ( syringePumpState != SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE ) && ( syringePumpState != SYRINGE_PUMP_OFF_STATE ) )
+    {
+        syringePumpState = SYRINGE_PUMP_OFF_STATE;
+    }
     if ( ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState ) || ( HEPARIN_STATE_DISPENSING == heparinDeliveryState ) )
     {
         heparinDeliveryState = HEPARIN_STATE_STOPPED;