diff --git a/xs/src/libslic3r/GCode.cpp b/xs/src/libslic3r/GCode.cpp
index 8ad479532..dc8e5d691 100644
--- a/xs/src/libslic3r/GCode.cpp
+++ b/xs/src/libslic3r/GCode.cpp
@@ -1287,6 +1287,10 @@ void GCode::process_layer(
             m_wipe_tower->tool_change(*this, extruder_id, extruder_id == layer_tools.extruders.back()) :
             this->set_extruder(extruder_id);
 
+        // let analyzer tag generator aware of a role type change
+        if (m_enable_analyzer && layer_tools.has_wipe_tower && m_wipe_tower)
+            m_last_analyzer_extrusion_role = erWipeTower;
+
         if (extrude_skirt) {
             auto loops_it = skirt_loops_per_extruder.find(extruder_id);
             if (loops_it != skirt_loops_per_extruder.end()) {
@@ -2170,7 +2174,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
     double F = speed * 60;  // convert mm/sec to mm/min
     
     // extrude arc or line
-    if (m_enable_extrusion_role_markers || m_enable_analyzer)
+    if (m_enable_extrusion_role_markers)
     {
         if (path.role() != m_last_extrusion_role)
         {
@@ -2181,18 +2185,20 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
                 sprintf(buf, ";_EXTRUSION_ROLE:%d\n", int(m_last_extrusion_role));
                 gcode += buf;
             }
-            if (m_enable_analyzer)
-            {
-                char buf[32];
-                sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), int(m_last_extrusion_role));
-                gcode += buf;
-            }
         }
     }
 
     // adds analyzer tags and updates analyzer's tracking data
     if (m_enable_analyzer)
     {
+        if (path.role() != m_last_analyzer_extrusion_role)
+        {
+            m_last_analyzer_extrusion_role = path.role();
+            char buf[32];
+            sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), int(m_last_analyzer_extrusion_role));
+            gcode += buf;
+        }
+
         if (m_last_mm3_per_mm != path.mm3_per_mm)
         {
             m_last_mm3_per_mm = path.mm3_per_mm;
@@ -2230,6 +2236,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
         if (path.role() == erExternalPerimeter)
             comment += ";_EXTERNAL_PERIMETER";
     }
+
     // F is mm per minute.
     gcode += m_writer.set_speed(F, "", comment);
     double path_length = 0.;
diff --git a/xs/src/libslic3r/GCode.hpp b/xs/src/libslic3r/GCode.hpp
index 968cd14de..d028e90aa 100644
--- a/xs/src/libslic3r/GCode.hpp
+++ b/xs/src/libslic3r/GCode.hpp
@@ -121,6 +121,7 @@ public:
         m_enable_cooling_markers(false), 
         m_enable_extrusion_role_markers(false), 
         m_enable_analyzer(false),
+        m_last_analyzer_extrusion_role(erNone),
         m_layer_count(0),
         m_layer_index(-1), 
         m_layer(nullptr), 
@@ -253,6 +254,7 @@ protected:
     // Extended markers will be added during G-code generation.
     // The G-code Analyzer will remove these comments from the final G-code.
     bool                                m_enable_analyzer;
+    ExtrusionRole                       m_last_analyzer_extrusion_role;
     // How many times will change_layer() be called?
     // change_layer() will update the progress bar.
     unsigned int                        m_layer_count;
diff --git a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
index ad7d91c50..b414186be 100644
--- a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
+++ b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
@@ -126,6 +126,11 @@ public:
 			m_extrusions.emplace_back(WipeTower::Extrusion(WipeTower::xy(rot.x, rot.y), width, m_current_tool));			
 		}
 
+        // adds tag for analyzer
+        char buf[64];
+        sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), erWipeTower);
+        m_gcode += buf;
+
 		m_gcode += "G1";
 		if (rot.x != rotated_current_pos.x) {
 			m_gcode += set_format_X(rot.x);     // Transform current position back to wipe tower coordinates (was updated by set_format_X)
@@ -488,11 +493,6 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::prime(
 		.travel(cleaning_box.ld, 7200)
 		.set_extruder_trimpot(750); 			// Increase the extruder driver current to allow fast ramming.
 
-    // adds tag for analyzer
-    char buf[32];
-    sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), erWipeTower);
-    writer.append(buf);
-
     for (size_t idx_tool = 0; idx_tool < tools.size(); ++ idx_tool) {
         unsigned int tool = tools[idx_tool];
         m_left_to_right = true;
@@ -585,12 +585,6 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
 	xy initial_position = cleaning_box.ld + WipeTower::xy(0.f,m_depth_traversed);
     writer.set_initial_position(initial_position);
 
-
-    // adds tag for analyzer
-    char buf[32];
-    sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), erWipeTower);
-    writer.append(buf);
-
     // Increase the extruder driver current to allow fast ramming.
     writer.set_extruder_trimpot(750);
 
@@ -658,12 +652,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::toolchange_Brim(bool sideOnly, flo
 	xy initial_position = wipeTower_box.lu - xy(m_perimeter_width * 6.f, 0);
 	writer.set_initial_position(initial_position);
 
-    // adds tag for analyzer
-    char buf[32];
-    sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), erWipeTower);
-    writer.append(buf)
-          .extrude_explicit(wipeTower_box.ld - xy(m_perimeter_width * 6.f, 0), // Prime the extruder left of the wipe tower.
-                            1.5f * m_extrusion_flow * (wipeTower_box.lu.y - wipeTower_box.ld.y), 2400);
+    writer.extrude_explicit(wipeTower_box.ld - xy(m_perimeter_width * 6.f, 0), // Prime the extruder left of the wipe tower.
+        1.5f * m_extrusion_flow * (wipeTower_box.lu.y - wipeTower_box.ld.y), 2400);
 
     // The tool is supposed to be active and primed at the time when the wipe tower brim is extruded.
     // Extrude 4 rounds of a brim around the future wipe tower.