diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c47564a6ef..617b11fb33 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -815,7 +815,9 @@
 #endif
 
 // Check for stuck or disconnected endstops during homing moves.
-#define DETECT_BROKEN_ENDSTOP
+#if DISABLED(TazPro, MiniV2)
+  #define DETECT_BROKEN_ENDSTOP
+#endif
 
 //=============================================================================
 //============================== Movement Settings ============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e5ce92bcb2..99ad89fb74 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -798,10 +798,15 @@
     #define GANTRY_CALIBRATION_CURRENT   600                   // Default calibration current in ma - TMC
   #endif
   #define GANTRY_CALIBRATION_EXTRA_HEIGHT      15                   // Extra distance in mm past Z_###_POS to move
-  #define GANTRY_CALIBRATION_DIRECTION          1                   // Set to 1 for Max or 0 for min
+  #if ENABLED(MiniV2)
+    #define GANTRY_CALIBRATION_DIRECTION          0                   // Set to 1 for Max or 0 for min
+  #else
+    #define GANTRY_CALIBRATION_DIRECTION          1                   // Set to 1 for Max or 0 for min
+  #endif
+
   #define GANTRY_CALIBRATION_FEEDRATE         500                   // Feedrate for correction move
 
-  #define GANTRY_CALIBRATION_SAFE_POSITION  {X_CENTER, Y_CENTER}  // Safe position for nozzle
+  #define GANTRY_CALIBRATION_SAFE_POSITION  {X_CENTER, Y_MIN}  // Safe position for nozzle
   #define GANTRY_CALIBRATION_XY_PARK_FEEDRATE 3000                // XY Park Feedrate - MMM
   //#define GANTRY_CALIBRATION_COMMANDS_PRE   ""
   //#define GANTRY_CALIBRATION_COMMANDS_POST  "G28"