Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rd19e40d16018de6ceb9c1c32e738889845df6ce1 -rfaaa80bfef7fdcfea8c03163db14c83300d64a23
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision d19e40d16018de6ceb9c1c32e738889845df6ce1)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision faaa80bfef7fdcfea8c03163db14c83300d64a23)
@@ -67,7 +67,7 @@
 #define SYRINGE_PUMP_PRIME_RATE                       635.0                                 ///< Prime rate is 0.5 mm ^ 2 x PI x 450 mm = 0.353 mL / 2s = 635 mL/hr.
 #define SYRINGE_PUMP_MAX_RATE                         11000.0                               ///< Maximum rate of the syringe pump (in mL/hr).
 
-#define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )    ///< Alarm persistence period for syringe pump speed check alarms.
+#define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           ( MS_PER_SECOND * 3 / TASK_PRIORITY_INTERVAL )  ///< Alarm persistence period for syringe pump speed check alarms.
 #define SYRINGE_PUMP_DIR_ALARM_PERSISTENCE            ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )    ///< Alarm persistence period for syringe pump direction check alarms.
 #define SYRINGE_PUMP_OFF_ALARM_PERSISTENCE            ( 500 / TASK_PRIORITY_INTERVAL )              ///< Alarm persistence period for syringe pump off check alarms.
 #define SYRINGE_PUMP_OCCLUSION_ALARM_PERSISTENCE      ( 30 / TASK_PRIORITY_INTERVAL )               ///< Alarm persistence period for syringe pump occlusion alarms.
@@ -854,8 +854,7 @@
     syringePumpEncoderMeasuredDirection = ( getSyringePumpPosition() - syringePumpLastPosition >= 0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
 
     // Check if syringe pump is on while BP is off
-    if ( ( syringePumpState > SYRINGE_PUMP_OFF_STATE ) &&
-         ( syringePumpState < SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE ) &&
+    if ( ( ( SYRINGE_PUMP_HEP_BOLUS_STATE == syringePumpState ) || ( SYRINGE_PUMP_HEP_CONTINUOUS_STATE == syringePumpState ) ) &&
          ( isBloodPumpRunning() != TRUE ) )
     {
         if ( ++syringePumpRunningWhileBPOffErrorCtr > SYRINGE_PUMP_OFF_ALARM_PERSISTENCE )