diff --git a/files/macros/M600-support-3v3.cfg b/files/macros/M600-support-3v3.cfg
index a4116ea..77ed3d8 100644
--- a/files/macros/M600-support-3v3.cfg
+++ b/files/macros/M600-support-3v3.cfg
@@ -6,9 +6,14 @@
 
 [idle_timeout]
 gcode:
-  RESPOND TYPE=command MSG="Stopping hotend heating..."
-  M104 S0
-timeout: 99999999
+  {% if printer["gcode_macro M600"].m600_state == 1 %}
+    RESPOND TYPE=command MSG="Stopping hotend heating..."
+    M104 S0
+  {% else %}
+    TURN_OFF_HEATERS
+    M84
+  {% endif %}
+timeout: 1800
 
 
 [filament_switch_sensor filament_sensor]
@@ -161,7 +166,7 @@ gcode:
       SET_GCODE_VARIABLE MACRO=M600 VARIABLE=fan0_speed VALUE=0
     {% endif %}
     SET_GCODE_VARIABLE MACRO=M600 VARIABLE=m600_state VALUE=0
-    SET_IDLE_TIMEOUT TIMEOUT=99999999
+    SET_IDLE_TIMEOUT TIMEOUT=1800
     RESPOND TYPE=command MSG="action:prompt_end"
   {% else %}
     {% if printer.extruder.can_extrude|lower == 'true' %}
diff --git a/files/macros/M600-support.cfg b/files/macros/M600-support.cfg
index fa99c72..27908df 100644
--- a/files/macros/M600-support.cfg
+++ b/files/macros/M600-support.cfg
@@ -6,9 +6,14 @@
 
 [idle_timeout]
 gcode:
-  RESPOND TYPE=command MSG="Stopping hotend heating..."
-  M104 S0
-timeout: 99999999
+  {% if printer["gcode_macro M600"].m600_state == 1 %}
+    RESPOND TYPE=command MSG="Stopping hotend heating..."
+    M104 S0
+  {% else %}
+    TURN_OFF_HEATERS
+    M84
+  {% endif %}
+timeout: 1800
 
 
 [filament_switch_sensor filament_sensor]
@@ -161,7 +166,7 @@ gcode:
       SET_GCODE_VARIABLE MACRO=M600 VARIABLE=fan0_speed VALUE=0
     {% endif %}
     SET_GCODE_VARIABLE MACRO=M600 VARIABLE=m600_state VALUE=0
-    SET_IDLE_TIMEOUT TIMEOUT=99999999
+    SET_IDLE_TIMEOUT TIMEOUT=1800
     RESPOND TYPE=command MSG="action:prompt_end"
   {% else %}
     {% if printer.extruder.can_extrude|lower == 'true' %}