diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index 489591f64..2aa5a66d9 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -849,10 +849,6 @@ gcode:
         {'index': 1, 'name': 'last_extruder1_temp'}] %}
     {% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "last_extruder1_temp" %}
     {% set value = printer["gcode_macro RESUME"][temperature].temp %}
-    {% if printer[printer.toolhead.extruder].temperature < value-3 %}
-        {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
-        RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature, this may take some time." % msg}'
-    {% endif %}
     {% for info in extruder_info %}
         {% set variable = printer["gcode_macro RESUME"][info.name] %}
         {% if variable.restore %}
@@ -865,8 +861,9 @@ gcode:
             {% set tool = "extruder" if info.index == 0 else "extruder1" %}
             {% set needwait = True if printer[tool].temperature < variable.temp else False %}
             {% if needwait %}
+                RESPOND TYPE=echo MSG='{"Restoring activated extruder temperature, this may take some time."}'
                 M109 T{info.index} S{variable.temp}
-                {% endif %}
+            {% endif %}
         {% endif %}
     {% endfor %}
 
@@ -962,7 +959,6 @@ gcode:
     {% set autoshift = printer.save_variables.variables.auto_change_nozzle|default(False) %}
     {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
     {% set do_resume = False %}
-    {% set prompt_txt = [] %}
     {% set runout = True %}
     ##### end of definitions #####
     _FILAMENT_UPDATE
@@ -979,16 +975,12 @@ gcode:
     {% set can_extrude = True if printer.toolhead.extruder == ''           # no extruder defined in config
                     else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder
     #### Printer comming from timeout idle state ####
-    {% if printer.idle_timeout.state|upper == "IDLE" or idle_state or autoshift %}
+    {% if printer.idle_timeout.state|upper == "IDLE" or idle_state %}
         SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False
-        {% if last_extruder_temp.restore or last_extruder1_temp.restore %}
-            # we need to use the unicode (\u00B0) for the ¡ã as py2 env's would throw an error otherwise
-            {client.user_temp_macro|default("")}
-            {% set do_resume = True %}
-        {% elif can_extrude %}
-            {% set do_resume = True %}
-        {% endif %}
-    #### Printer comming out of regular PAUSE state ####
+    {% endif %}
+    {% if last_extruder_temp.restore or last_extruder1_temp.restore %}
+        {client.user_temp_macro|default("")}
+        {% set do_resume = True %}
     {% elif can_extrude %}
         {% set do_resume = True %}
     {% endif %}