Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rcc7f1bd82e346521f0102b3398bd030fb3bb0e6f -r3cd18f36353f934828a4d1077d4e12d8574169e0
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cc7f1bd82e346521f0102b3398bd030fb3bb0e6f)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 3cd18f36353f934828a4d1077d4e12d8574169e0)
@@ -482,11 +482,14 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
-    {
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    {
+        heparinDeliveryState = HEPARIN_STATE_OFF;
+    }
 #endif
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
+    {
         {
             heparinDeliveryState = HEPARIN_STATE_STOPPED;
             if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )