Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r494828bba7e66a82f498a0fee6f370e387f99fb9
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 494828bba7e66a82f498a0fee6f370e387f99fb9)
@@ -1033,6 +1033,12 @@
 {
     // Execute syringe pump monitor
     execSyringePumpMonitor();
+
+    // Clear pump running while off alarm persistence if not in off state
+    if ( syringePumpState != SYRINGE_PUMP_OFF_STATE )
+    {
+        isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, FALSE );
+    }
 
     // Execute syringe pump control state machine
     switch ( syringePumpState )
@@ -1327,7 +1333,6 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
-        retractSyringePump();
         result = SYRINGE_PUMP_OFF_STATE;
     }
 
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r79bfed401b30627f10c4c75f69597a4d41271a98 -r494828bba7e66a82f498a0fee6f370e387f99fb9
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 79bfed401b30627f10c4c75f69597a4d41271a98)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 494828bba7e66a82f498a0fee6f370e387f99fb9)
@@ -54,7 +54,7 @@
     #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
-    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
+//    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
     #define DISABLE_ARTERIAL_PRESSURE_CHECK 1           // Do not error on arterial pressure out of range
@@ -76,7 +76,7 @@
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
     #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
-    #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
+//    #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
 //    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST