diff --git a/config/machine.cfg b/config/machine.cfg
index 0f239a2a6..734cb60f5 100644
--- a/config/machine.cfg
+++ b/config/machine.cfg
@@ -1,13 +1,18 @@
 [virtual_sdcard]
 path: ~/printer_data/gcodes
 on_error_gcode:
-   {% if printer["gcode_macro _USER_VARIABLES"].status_leds_enabled %}
-      STATUS_LEDS COLOR="ERROR"
-   {% endif %}
-   {% if printer["gcode_macro _USER_VARIABLES"].probe_type_enabled == "dockable" %}
-       _PROBE_ON_ERROR_ACTION
-   {% endif %}
-   PARK
+    {% if printer["gcode_macro _USER_VARIABLES"].status_leds_enabled %}
+        STATUS_LEDS COLOR="ERROR"
+    {% endif %}
+    {% if printer["gcode_macro _USER_VARIABLES"].probe_type_enabled == "dockable" or printer["gcode_macro _USER_VARIABLES"].probe_type_enabled == "dockable_virtual" %}
+        _PROBE_ON_ERROR_ACTION
+    {% endif %}
+
+    # Park only if printer is homed
+    {% if "xyz" in printer.toolhead.homed_axes %}
+        PARK
+    {% endif %}
+   
 
 [idle_timeout]
 timeout: 1800