Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rd47b6f178dd68d49962c72a5ccb6e98152a2a1d0 -rfa401ca0f496b745865fe86113f82a1720060108
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d47b6f178dd68d49962c72a5ccb6e98152a2a1d0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision fa401ca0f496b745865fe86113f82a1720060108)
@@ -507,12 +507,21 @@
     }
 
     // If homing has been initiated, wait for syringe pump to home and the verify force sensor calibration
-    if ( ( TRUE == homingInitiated ) && ( TRUE == isSyringePumpHome() ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) == SW_CONFIG_ENABLE_VALUE )
     {
-        syringePumpVerifyForceSensorDACCalibration();
-        homingInitiated = FALSE;                        // reset for next time
         state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
     }
+    else
+#endif
+    {
+        if ( ( TRUE == homingInitiated ) && ( TRUE == isSyringePumpHome() ) )
+        {
+            syringePumpVerifyForceSensorDACCalibration();
+            homingInitiated = FALSE;                        // reset for next time
+            state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
+        }
+    }
 
     return state;
 }