diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 803fb94..4666a68 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -315,17 +315,29 @@ gcode:
 [gcode_macro _SAFE_X_HOME]
 ; This macro is to ensure that we're not at y=home when X is homed.
 gcode:
+  {% if 'Y' in printer.toolhead.homed_axes %}
+  G91
+  G0 Y-20 F50000
+  G90
+  {% else %}
   G90
   SET_KINEMATIC_POSITION Y=20
   G0 Y0 F50000
   G28 X
+  {% endif %}
 
 [gcode_macro _SAFE_Z_HOME_LIFT]
 ; Lift the Z no matter what (replicate z-hop from [safe_z_home]
 gcode:
+  {% if 'Z' in printer.toolhead.homed_axes %}
+  G91
+  G0 Z10 F1000
+  G90
+  {% else %}
   G90
   SET_KINEMATIC_POSITION Z=0
   G0 Z10 F1000
+  {% endif %}
 
 [gcode_macro _SAFE_Z_HOME]
 ; this macro recreates the save_z_home setup center the toolhead before z home.
@@ -345,7 +357,7 @@ gcode:
   _SAFE_X_HOME
   {% elif not 'Z' in params and not 'X' in params and 'Y' in params %} #Home Y
   G28 Y
-  {% elif not 'Z' in params %} #Home X+Y
+  {% elif not 'Z' in params and 'X' in params and 'Y' in params %} #Home X+Y
   _SAFE_X_HOME
   G28 Y
   {% else %} #Home X+Y+Z