Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r25ede6f944eb53b68c8073404663c99d3ce158b0 -r2a9b1bdc0537b4efd35b1dcbbfdb68adf86595ad
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 25ede6f944eb53b68c8073404663c99d3ce158b0)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 2a9b1bdc0537b4efd35b1dcbbfdb68adf86595ad)
@@ -68,6 +68,8 @@
 #define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           3000                                  ///< Alarm persistence period (in ms) for syringe pump speed check alarms.
 #define SYRINGE_PUMP_DIR_ALARM_PERSISTENCE            3000                                  ///< Alarm persistence period (in ms) for syringe pump direction check alarms.
 #define SYRINGE_PUMP_OFF_ALARM_PERSISTENCE            1000                                  ///< Alarm persistence period (in ms) for syringe pump off check alarms.
+#define SYRINGE_PUMP_OFF_ERROR_MAX_CNT                3                                     ///< Maximum number of syringe pump not stopped errors within time window before alarm triggered.
+#define SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS            (1 * MS_PER_SECOND)                   ///< Time window for Syringe Pump not stopped error.
 
 #define STEPS_TO_MICROSTEPS( s )                      ( (s) * 32.0F )                       ///< Macro conversion from steps to microsteps.
 #define MICROSTEPS_TO_STEPS( m )                      ( (m) / 32.0F )                       ///< Macro conversion from microsteps to steps.
@@ -326,8 +328,8 @@
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE );
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS );
 
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT,
                              SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS, SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS );
@@ -1158,12 +1160,6 @@
     // 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 );
-    }
-
     if ( syringePumpDACRetryCount > 0 )
     {
         syringePumpDACRetryTimer++;
@@ -1293,7 +1289,7 @@
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_OFF_STATE;
 
     // Check position is not changing while stopped
-    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, ( syringePumpLastPosition != getSyringePumpPosition() ) ) ) )
+    if ( ( syringePumpLastPosition != getSyringePumpPosition() ) && ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR ) ) )
     {
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )