Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rc5f3dfc2a87c35036f21f969f6e762ae779839f2 -ra9ced54a9efe56fc1e5ce9ef3f06e9d40be11bdd
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c5f3dfc2a87c35036f21f969f6e762ae779839f2)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision a9ced54a9efe56fc1e5ce9ef3f06e9d40be11bdd)
@@ -940,10 +940,31 @@
     // Get latest ADC data and convert to V
     syringePumpMeasHome.data = ( (F32)getFPGASyringePumpADCChannel2() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
     syringePumpMeasSyringeDetectionSwitch.data = ( (F32)getFPGASyringePumpADCChannel1() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
-    // On transition from not detected to detected - clear syringe removed alarm condition
-    if ( ( prevSyringeDetected != TRUE ) && ( TRUE == isSyringeDetected() ) )
+
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
+        // On transition from not detected to detected - clear syringe removed alarm condition
+        if ( ( prevSyringeDetected != TRUE ) && ( TRUE == isSyringeDetected() ) )
+        {
+            clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
+        }
+        // If no syringe detected while syringe removed alarm is active, maintain alarm condition
+        else if ( ( FALSE == isSyringeDetected() ) && ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED ) ) )
+        {
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
+        }
+        // On transition from detected to not detected - clear syringe detected alarm condition
+        if ( ( TRUE == prevSyringeDetected ) && ( isSyringeDetected() != TRUE ) )
+        {
+            clearAlarmCondition( ALARM_ID_HD_SYRINGE_DETECTED );
+        }
+        // If syringe detected while syringe detected alarm is active, maintain alarm condition
+        else if ( ( TRUE == isSyringeDetected() ) && ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_DETECTED ) ) )
+        {
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
+        }
     }
 
     forceSensorBeforCal = ( (F32)getFPGASyringePumpADCChannel0() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;