diff --git a/Marlin/pins_EINSY_RAMBO.h b/Marlin/pins_EINSY_RAMBO.h
index 679f31ed3..c6da8ea65 100644
--- a/Marlin/pins_EINSY_RAMBO.h
+++ b/Marlin/pins_EINSY_RAMBO.h
@@ -49,13 +49,36 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          64 //12
+// Only use Diag Pins when SENSORLESS_HOMING is enabled for the TMC2130 drivers.
+// Otherwise use a physical endstop based configuration.
+//
+// SERVO0_PIN and Z_MIN_PIN configuration for BLTOUCH sensor when combined with SENSORLESS_HOMING.
+//
+
 #define X_MAX_PIN          -1
-#define Y_MIN_PIN          69 //11
 #define Y_MAX_PIN          -1
-#define Z_MIN_PIN          68 //10
 #define Z_MAX_PIN          -1
 
+#if DISABLED(SENSORLESS_HOMING)
+
+  #define X_MIN_PIN          12
+  #define Y_MIN_PIN          11
+  #define Z_MIN_PIN          10
+
+#else
+
+  #define X_MIN_PIN          X_DIAG_PIN
+  #define Y_MIN_PIN          Y_DIAG_PIN
+
+  #if ENABLED(BLTOUCH)
+    #define Z_MIN_PIN        11 // Y-MIN
+    #define SERVO0_PIN       10 // Z-MIN
+  #else
+    #define Z_MIN_PIN        10
+  #endif
+
+#endif
+
 //
 // Z Probe (when not Z_MIN_PIN)
 //