Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -rd7e01dce5b2ebb1ea02832a9ced81550a919b67b
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision d7e01dce5b2ebb1ea02832a9ced81550a919b67b)
@@ -468,10 +468,21 @@
         activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
     }
 
-    if ( TRUE == isSyringeDetected() )
-    {
-        activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
-    }
+        if ( TRUE == isSyringeDetected() )
+        {
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
+            }
+        }
+        // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
+        if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
+        {
+            cmdStopDG();
+            requestNewOperationMode( MODE_STAN );
+        }
     // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
     if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
     {