diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg
index 04f13fba8..b530e4895 100644
--- a/config/CreatBot_D1000/base.cfg
+++ b/config/CreatBot_D1000/base.cfg
@@ -545,12 +545,12 @@ gcode:
 [gcode_macro M109]
 rename_existing: C109
 gcode:
-    {% set hotend = "extruder" %}
+    {% set hotend = printer.toolhead.extruder %}
     {% set s = params.S|default(0)|float %}
     {% set t = params.T|default(0)|int %}
     {% if params.S is defined %}
-        {% if t != 0 %}
-            {% set hotend = hotend ~ t %}
+        {% if params.T is defined %}
+           {% set hotend = "extruder" ~ (t if t != 0 else '') %}
         {% endif %}
         SET_HEATER_TEMPERATURE HEATER={hotend} TARGET={s}
         {% if s != 0 %}
diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg
index c13c6a6a5..ea144caf2 100644
--- a/config/CreatBot_D600Pro2/base.cfg
+++ b/config/CreatBot_D600Pro2/base.cfg
@@ -538,12 +538,12 @@ gcode:
 [gcode_macro M109]
 rename_existing: C109
 gcode:
-    {% set hotend = "extruder" %}
+    {% set hotend = printer.toolhead.extruder %}
     {% set s = params.S|default(0)|float %}
     {% set t = params.T|default(0)|int %}
     {% if params.S is defined %}
-        {% if t != 0 %}
-            {% set hotend = hotend ~ t %}
+        {% if params.T is defined %}
+           {% set hotend = "extruder" ~ (t if t != 0 else '') %}
         {% endif %}
         SET_HEATER_TEMPERATURE HEATER={hotend} TARGET={s}
         {% if s != 0 %}
diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index 62ad3ec11..2929ccc90 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -684,12 +684,12 @@ gcode:
 [gcode_macro M109]
 rename_existing: C109
 gcode:
-    {% set hotend = "extruder" %}
+    {% set hotend = printer.toolhead.extruder %}
     {% set s = params.S|default(0)|float %}
     {% set t = params.T|default(0)|int %}
     {% if params.S is defined %}
-        {% if t != 0 %}
-            {% set hotend = hotend ~ t %}
+        {% if params.T is defined %}
+           {% set hotend = "extruder" ~ (t if t != 0 else '') %}
         {% endif %}
         SET_HEATER_TEMPERATURE HEATER={hotend} TARGET={s}
         {% if s != 0 %}