diff --git a/klippy/extras/display/menu.cfg b/klippy/extras/display/menu.cfg
index c9fa5b1e2..a5c4d4309 100644
--- a/klippy/extras/display/menu.cfg
+++ b/klippy/extras/display/menu.cfg
@@ -712,7 +712,9 @@ name: Begin probe calibration
 enable: {('probe' in printer) or ('bltouch' in printer)}
 gcode:
     ABORT
-    G28
+    {% if 'z' not in printer.toolhead.homed_axes %}
+        G28
+    {% endif %}
     PROBE_CALIBRATE
 
 [menu __main __setup __calib __offsetz __begin_endstop]
@@ -721,7 +723,9 @@ name: Begin Z-endstop calibration
 enable: {('position_endstop' in printer.configfile.config.stepper_z)}
 gcode:
     ABORT
-    G28
+    {% if 'z' not in printer.toolhead.homed_axes %}
+        G28
+    {% endif %}
     Z_ENDSTOP_CALIBRATE
 
 [menu __main __setup __calib __offsetz __test]