Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r3f5b2cfad9edd2a67c0c6bbc9fd7f74021d566b8 -rcf7f4d116efb36b993fd9b27af677d9da468c50e
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 3f5b2cfad9edd2a67c0c6bbc9fd7f74021d566b8)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cf7f4d116efb36b993fd9b27af677d9da468c50e)
@@ -478,7 +478,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;