diff --git a/files/macros/M600-support.cfg b/files/macros/M600-support.cfg
index 14d9520..3516f3c 100644
--- a/files/macros/M600-support.cfg
+++ b/files/macros/M600-support.cfg
@@ -92,12 +92,14 @@ gcode:
     {% set s_value = (printer['gcode_macro PRINTER_PARAM'].fan2_speed * 255 - printer['gcode_macro PRINTER_PARAM'].fan2_min) * 255 / (255 - printer['gcode_macro PRINTER_PARAM'].fan2_min)|float %}
     M106 P2 S{s_value}
   {% endif %}
-  {% set z_resume_move = printer['gcode_macro PRINTER_PARAM'].z_safe_pause|int %}
-  {% if z_resume_move > 2 %}
-    {% set z_resume_move = z_resume_move - 2 %}
-    G91
-    G1 Z-{z_resume_move} F600
-    M400
+  {% if printer['gcode_macro M600'].m600_state != 1 %}
+    {% set z_resume_move = printer['gcode_macro PRINTER_PARAM'].z_safe_pause|int %}
+    {% if z_resume_move > 2 %}
+      {% set z_resume_move = z_resume_move - 2 %}
+      G91
+      G1 Z-{z_resume_move} F600
+      M400
+    {% endif %}
   {% endif %}
   {% set E = printer["gcode_macro PAUSE"].extrude|float + 1.0 %}
   {% if 'VELOCITY' in params|upper %}