diff --git a/macros/base/start_print.cfg b/macros/base/start_print.cfg
index 0718ed89c..e98859a1c 100644
--- a/macros/base/start_print.cfg
+++ b/macros/base/start_print.cfg
@@ -414,6 +414,7 @@ gcode:
     # Preheat the nozzle to safe probing temperature.
     {% set safe_extruder_temp = printer["gcode_macro _USER_VARIABLES"].safe_extruder_temp|float %}
     {% set status_leds_enabled = printer["gcode_macro _USER_VARIABLES"].status_leds_enabled %}
+    {% set probe_type_enabled = printer["gcode_macro _USER_VARIABLES"].probe_type_enabled %}
     {% set verbose = printer["gcode_macro _USER_VARIABLES"].verbose %}
 
     {% if status_leds_enabled %}
@@ -423,10 +424,22 @@ gcode:
         RESPOND MSG="Pre-heating the nozzle to a safe temperature..."
     {% endif %}
 
-    M109 S{safe_extruder_temp}
-
-    {% if verbose %}
-        RESPOND MSG="Extruder at safe temperature of {safe_extruder_temp} degrees"
+    {% if probe_type_enabled == "vorontap" %}
+        M109 S{safe_extruder_temp}
+        {% if verbose %}
+            RESPOND MSG="Extruder at safe temperature of {safe_extruder_temp} degrees"
+        {% endif %}        
+    {% else %}
+        {% if printer.extruder.target < safe_extruder_temp %}
+            M104 S{safe_extruder_temp} 
+            {% if verbose %}
+                RESPOND MSG="Extruder is heating at temperature of {safe_extruder_temp} degrees"
+            {% endif %}
+        {% else %}
+            {% if verbose %}
+                RESPOND MSG="Extruder is already hot"
+            {% endif %}
+        {% endif %}
     {% endif %}