diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 9b305e483..5400e1db9 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4606,8 +4606,12 @@ void home_all_axes() { gcode_G28(true); }
         abl_grid_points_y = parser.intval('Y', GRID_MAX_POINTS_Y);
         if (parser.seenval('P')) abl_grid_points_x = abl_grid_points_y = parser.value_int();
 
-        if (abl_grid_points_x < 2 || abl_grid_points_y < 2) {
-          SERIAL_PROTOCOLLNPGM("?Number of probe points is implausible (2 minimum).");
+        if (!WITHIN(abl_grid_points_x, 2, GRID_MAX_POINTS_X)) {
+          SERIAL_PROTOCOLLNPGM("?Probe points (X) is implausible (2-" STRINGIFY(GRID_MAX_POINTS_X) ").");
+          return;
+        }
+        if (!WITHIN(abl_grid_points_y, 2, GRID_MAX_POINTS_Y)) {
+          SERIAL_PROTOCOLLNPGM("?Probe points (Y) is implausible (2-" STRINGIFY(GRID_MAX_POINTS_Y) ").");
           return;
         }