Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r34d0843fa73e79ba3b085dd4aaa393a1ec126fd4 -rd7b793881e8414f2daf75825d5de4e25a25d10ac
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 34d0843fa73e79ba3b085dd4aaa393a1ec126fd4)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d7b793881e8414f2daf75825d5de4e25a25d10ac)
@@ -619,18 +619,25 @@
     }
 
     // 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 ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP )  )
     {
-        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;
 }
-// Verify calibration
 
-
 /*********************************************************************//**
  * @brief
  * The handleStandbyModeWaitForTreatmentState function handles wait for