diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 3e5c583a22..c310d419fd 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2564,7 +2564,7 @@ LayerResult GCodeGenerator::process_layer(
     }
 
     this->set_origin({0, 0});
-    bool moved_to_first_point{false};
+    this->m_moved_to_first_layer_point = false;
 
     // Extrude the skirt, brim, support, perimeters, infill ordered by the extruders.
     for (const ExtruderExtrusions &extruder_extrusions : extrusions)
@@ -2589,7 +2589,7 @@ LayerResult GCodeGenerator::process_layer(
             this->m_label_objects.update(nullptr);
         }
 
-        if (!moved_to_first_point) {
+        if (!this->m_moved_to_first_layer_point) {
             const Vec3crd point{to_3d(first_point, scaled(print_z))};
 
             gcode += this->travel_to_first_position(point, print_z, ExtrusionRole::Mixed, [this]() {
@@ -2598,7 +2598,6 @@ LayerResult GCodeGenerator::process_layer(
                 }
                 return m_label_objects.maybe_change_instance(m_writer);
             });
-            moved_to_first_point = true;
         }
 
         if (!extruder_extrusions.skirt.empty()) {
@@ -3116,6 +3115,7 @@ std::string GCodeGenerator::travel_to_first_position(const Vec3crd& point, const
         this->writer().update_position(gcode_point);
     }
 
+    this->m_moved_to_first_layer_point = true;
     return gcode;
 }
 
diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp
index 82e2dc151a..0727f9071f 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -429,6 +429,8 @@ private:
 
     std::optional<Vec3d>                m_previous_layer_last_position;
     std::optional<Vec3d>                m_previous_layer_last_position_before_wipe;
+    bool                                m_moved_to_first_layer_point{false};
+
     // This needs to be populated during the layer processing!
     std::unique_ptr<CoolingBuffer>      m_cooling_buffer;
     std::unique_ptr<SpiralVase>         m_spiral_vase;
diff --git a/src/libslic3r/GCode/WipeTowerIntegration.cpp b/src/libslic3r/GCode/WipeTowerIntegration.cpp
index b281060ff8..b36dc9de94 100644
--- a/src/libslic3r/GCode/WipeTowerIntegration.cpp
+++ b/src/libslic3r/GCode/WipeTowerIntegration.cpp
@@ -68,13 +68,18 @@ std::string WipeTowerIntegration::append_tcr(GCodeGenerator &gcodegen, const Wip
         gcode += gcodegen.retract_and_wipe();
         gcodegen.m_avoid_crossing_perimeters.use_external_mp_once = true;
         const std::string comment{"Travel to a Wipe Tower"};
-        if (gcodegen.last_position) {
-            gcode += gcodegen.travel_to(
-                *gcodegen.last_position, xy_point, ExtrusionRole::Mixed, comment, [](){return "";}
-            );
+        if (!gcodegen.m_moved_to_first_layer_point) {
+            const Vec3crd point = to_3d(xy_point, scaled(z));
+            gcode += gcodegen.travel_to_first_position(point, current_z, ExtrusionRole::Mixed, [](){return "";});
         } else {
-            gcode += gcodegen.writer().travel_to_xy(gcodegen.point_to_gcode(xy_point), comment);
-            gcode += gcodegen.writer().get_travel_to_z_gcode(z, comment);
+            if (gcodegen.last_position) {
+                gcode += gcodegen.travel_to(
+                    *gcodegen.last_position, xy_point, ExtrusionRole::Mixed, comment, [](){return "";}
+                );
+            } else {
+                gcode += gcodegen.writer().travel_to_xy(gcodegen.point_to_gcode(xy_point), comment);
+                gcode += gcodegen.writer().get_travel_to_z_gcode(z, comment);
+            }
         }
         gcode += gcodegen.unretract();
     } else {