diff --git a/macros/base/control.cfg b/macros/base/control.cfg
index a52cf3291..0f857bcd3 100644
--- a/macros/base/control.cfg
+++ b/macros/base/control.cfg
@@ -22,4 +22,4 @@ description: Turn off the printer and shutdown the host
 gcode:
     _OFF                                               ; Shortcut to turn everything off (see above for this macro)
     {action_respond_info('action:poweroff')}          ; OctoPrint compatible host shutdown
-	{action_call_remote_method("shutdown_machine")}   ; Moonraker compatible host shutdown
\ No newline at end of file
+	{action_call_remote_method("shutdown_machine")}   ; Moonraker compatible host shutdown
diff --git a/macros/base/park.cfg b/macros/base/park.cfg
index dca0db2d5..4374a096b 100644
--- a/macros/base/park.cfg
+++ b/macros/base/park.cfg
@@ -24,7 +24,9 @@ gcode:
         {% set z_safe = max_z %}
     {% endif %}
 
-    _CG28 ; home if not already homed
+    {% if printer.toolhead.homed_axes != "xyz" %}
+        {action_raise_error("Cannot park the toolhead because axis are not homed!")}
+    {% endif %}
 
     {% if printer.extruder.can_extrude %}
         {% if firmware_retraction_enabled %}    # use firmware_retraction parameter for retract (in case firmware retraction is selected in printer.cfg)
@@ -56,7 +58,9 @@ gcode:
     {% set St = printer["gcode_macro _USER_VARIABLES"].travel_speed * 60 %}
     {% set Sz = printer["gcode_macro _USER_VARIABLES"].z_drop_speed * 60 %}
 
-    _CG28 ; home if not already homed
+    {% if printer.toolhead.homed_axes != "xyz" %}
+        {action_raise_error("Cannot park the toolhead in maintenance position because axis are not homed!")}
+    {% endif %}
 
     SAVE_GCODE_STATE NAME=PARK_FRONT
     G90      ; absolute positioning