Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r9bf209fc5813b7e806f51f408ece77174a336c9b -rfe91ec494378a7df34e3c14853a797f9f8f044e9
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 9bf209fc5813b7e806f51f408ece77174a336c9b)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision fe91ec494378a7df34e3c14853a797f9f8f044e9)
@@ -120,6 +120,8 @@
     // Stop any DG fill that may be in progress from an aborted treatment
     cmdStopDGFill();
 
+    syringeDetectionRequired( FALSE );
+
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
@@ -467,29 +469,18 @@
     if ( TRUE == isSyringeDetected() )
     {
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
         }
     }
-    else
-    {
-        clearAlarmCondition( ALARM_ID_HD_SYRINGE_DETECTED );
-    }
 
     // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
     if ( TRUE == isCartridgeRemoved )
     {
         BOOL isSyringePumpDetected = isSyringeDetected();
 
-#ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) )
-        {
-            isSyringePumpDetected = FALSE;
-        }
-#endif
-
         if ( FALSE == isSyringePumpDetected )
         {
             cmdStopDG();