diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index e111f2ce4..885751d31 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -44,7 +44,17 @@
 #define Y_MIN_PIN                             26
 #define Y_MAX_PIN                             28
 #define Z_MIN_PIN                             30
-#define Z_MAX_PIN                             32
+
+#if ENABLED(BLTOUCH)
+  #if MB(GT2560_REV_A_PLUS)
+    #define SERVO0_PIN                        11
+  #else
+    #define SERVO0_PIN                        32
+  #endif
+  #define Z_MAX_PIN                           -1
+#else
+  #define Z_MAX_PIN                           32
+#endif
 
 //
 // Steppers
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
index 3ce4627dc..1a9fcfd27 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
@@ -29,8 +29,6 @@
 
 #include "pins_GT2560_REV_A.h"
 
-#if ENABLED(BLTOUCH)
-  #define SERVO0_PIN  11
-#else
+#if DISABLED(BLTOUCH)
   #define SERVO0_PIN  32
 #endif