diff --git a/Marlin/pins_3DRAG.h b/Marlin/pins_3DRAG.h
index 942a0ba3ea82d566b3f23d4508f0dd526e908830..4191dbc4ee74a1512deac2a120bc74b97aff11e8 100644
--- a/Marlin/pins_3DRAG.h
+++ b/Marlin/pins_3DRAG.h
@@ -4,10 +4,8 @@
 
 #include "pins_RAMPS_13.h"
 
-#define X_MAX_PIN           -1   //2 //Max endstops default to disabled "-1", set to commented value to enable.
-
-#define Y_MAX_PIN          -1   //15
-
+#define X_MAX_PIN          2
+#define Y_MAX_PIN          15
 #define Z_MAX_PIN          -1
 
 #define SDSS               25//53
diff --git a/Marlin/pins_ELEFU_3.h b/Marlin/pins_ELEFU_3.h
index b201a1306ca292c15101639fd9760a8b5dc5d425..4c9663a352ecfa4e44c7da2872aea3fcd9501161 100644
--- a/Marlin/pins_ELEFU_3.h
+++ b/Marlin/pins_ELEFU_3.h
@@ -10,19 +10,19 @@
 #define X_DIR_PIN          13
 #define X_ENABLE_PIN       48
 #define X_MIN_PIN          35
-#define X_MAX_PIN          -1 //34
+#define X_MAX_PIN          34
 
 #define Y_STEP_PIN         11
 #define Y_DIR_PIN          9
 #define Y_ENABLE_PIN       12
 #define Y_MIN_PIN          33
-#define Y_MAX_PIN          -1 //32
+#define Y_MAX_PIN          32
 
 #define Z_STEP_PIN         7
 #define Z_DIR_PIN          6
 #define Z_ENABLE_PIN       8
 #define Z_MIN_PIN          31
-#define Z_MAX_PIN          -1 //30
+#define Z_MAX_PIN          30
 
 #define E2_STEP_PIN        43
 #define E2_DIR_PIN         47
diff --git a/Marlin/pins_LEAPFROG.h b/Marlin/pins_LEAPFROG.h
index 5dd6654c1cd00e92d573fc148ee9f7d1e27da33d..52ca61939986cb8e6cb5cf3fe9d149b7415bee2c 100644
--- a/Marlin/pins_LEAPFROG.h
+++ b/Marlin/pins_LEAPFROG.h
@@ -10,13 +10,13 @@
 #define X_DIR_PIN          63
 #define X_ENABLE_PIN       29
 #define X_MIN_PIN          47
-#define X_MAX_PIN          -1   //2 //Max endstops default to disabled "-1", set to commented value to enable.
+#define X_MAX_PIN          2 //Max endstops default to disabled "-1", set to commented value to enable.
 
 #define Y_STEP_PIN         14 // A6
 #define Y_DIR_PIN          15 // A0
 #define Y_ENABLE_PIN       39
 #define Y_MIN_PIN          48
-#define Y_MAX_PIN          -1   //15
+#define Y_MAX_PIN          15
 
 #define Z_STEP_PIN         31 // A2
 #define Z_DIR_PIN          32 // A6
diff --git a/Marlin/pins_MEGATRONICS_1.h b/Marlin/pins_MEGATRONICS_1.h
index 26cfd2f3b61f2f70a5cb70dd224f86a9fdb6e8fd..f321941f8724122445ba27a481c498d77f1e50d3 100644
--- a/Marlin/pins_MEGATRONICS_1.h
+++ b/Marlin/pins_MEGATRONICS_1.h
@@ -12,13 +12,13 @@
 #define X_DIR_PIN 47
 #define X_ENABLE_PIN 49
 #define X_MIN_PIN 5
-#define X_MAX_PIN -1 // 2 // Max endstops default to disabled "-1", set to commented value to enable.
+#define X_MAX_PIN 2
 
 #define Y_STEP_PIN 39 // A6
 #define Y_DIR_PIN 40 // A0
 #define Y_ENABLE_PIN 38
 #define Y_MIN_PIN 2
-#define Y_MAX_PIN -1 // 15
+#define Y_MAX_PIN 15
 
 #define Z_STEP_PIN 42 // A2
 #define Z_DIR_PIN 43 // A6
diff --git a/Marlin/pins_MEGATRONICS_2.h b/Marlin/pins_MEGATRONICS_2.h
index a286c91816a6487b4a12d48705311e33ac06a5e5..064431be29efff89a2a1a7697288e295fb489d05 100644
--- a/Marlin/pins_MEGATRONICS_2.h
+++ b/Marlin/pins_MEGATRONICS_2.h
@@ -12,13 +12,13 @@
 #define X_DIR_PIN 27
 #define X_ENABLE_PIN 25
 #define X_MIN_PIN 37
-#define X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable.
+#define X_MAX_PIN 40
 
 #define Y_STEP_PIN 4 // A6
 #define Y_DIR_PIN 54 // A0
 #define Y_ENABLE_PIN 5
 #define Y_MIN_PIN 41
-#define Y_MAX_PIN 38 //15
+#define Y_MAX_PIN 38
 
 #define Z_STEP_PIN 56 // A2
 #define Z_DIR_PIN 60 // A6
diff --git a/Marlin/pins_RAMPS_OLD.h b/Marlin/pins_RAMPS_OLD.h
index d4e89f8d9bee181aabbe613b1df8bf10cd6f40ca..6b3454ac8bda05276e11bcc76282637858ebddec 100644
--- a/Marlin/pins_RAMPS_OLD.h
+++ b/Marlin/pins_RAMPS_OLD.h
@@ -13,23 +13,23 @@
 #define X_DIR_PIN          28
 #define X_ENABLE_PIN       24
 #define X_MIN_PIN           3
-#define X_MAX_PIN          -1    //2
+#define X_MAX_PIN           2
 
 #define Y_STEP_PIN         38
 #define Y_DIR_PIN          40
 #define Y_ENABLE_PIN       36
 #define Y_MIN_PIN          16
-#define Y_MAX_PIN          -1    //17
+#define Y_MAX_PIN          17
 
 #define Z_STEP_PIN         44
 #define Z_DIR_PIN          46
 #define Z_ENABLE_PIN       42
 #define Z_MIN_PIN          18
-#define Z_MAX_PIN          -1    //19
+#define Z_MAX_PIN          19
 
-#define E0_STEP_PIN         32
-#define E0_DIR_PIN          34
-#define E0_ENABLE_PIN       30
+#define E0_STEP_PIN        32
+#define E0_DIR_PIN         34
+#define E0_ENABLE_PIN      30
 
 #define SDPOWER            48
 #define SDSS               53