diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index cc9dfce30..8cd6b8f1d 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1646,6 +1646,10 @@ namespace ProcessLayer
                 else {
                     gcode += config.color_change_gcode;//ColorChangeCode;
                     gcode += "\n";
+                    //FIXME Tell G-code writer that M600 filled the extruder, thus the G-code writer shall reset the extruder to unretracted state after
+                    // return from M600. Thus the G-code generated by the following line is ignored.
+                    // see GH issue #6362
+                    gcodegen.writer().unretract();
                 }
 	        } 
 	        else