Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc7f1aa83cffc0e76d0ad11479e78792348648ce0 -r7571c19a33f72d1b7e67205d2ba9316122fa81c7
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c7f1aa83cffc0e76d0ad11479e78792348648ce0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 7571c19a33f72d1b7e67205d2ba9316122fa81c7)
@@ -619,12 +619,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;
 }