diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py
index 89812e7202..d05338ae4d 100644
--- a/plugins/GCodeReader/FlavorParser.py
+++ b/plugins/GCodeReader/FlavorParser.py
@@ -294,6 +294,11 @@ class FlavorParser:
                 extruder.getProperty("machine_nozzle_offset_y", "value")]
         return result
 
+    #
+    # CURA-6643
+    # This function needs the filename so it can be set to the SceneNode. Otherwise, if you load a GCode file and press
+    # F5, that gcode SceneNode will be removed because it doesn't have a file to be reloaded from.
+    #
     def processGCodeStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]:
         Logger.log("d", "Preparing to load GCode")
         self._cancelled = False
diff --git a/plugins/UFPReader/UFPReader.py b/plugins/UFPReader/UFPReader.py
index 18527e6450..71061f938b 100644
--- a/plugins/UFPReader/UFPReader.py
+++ b/plugins/UFPReader/UFPReader.py
@@ -39,4 +39,4 @@ class UFPReader(MeshReader):
         # Open the GCodeReader to parse the data
         gcode_reader = PluginRegistry.getInstance().getPluginObject("GCodeReader")  # type: ignore
         gcode_reader.preReadFromStream(gcode_stream)  # type: ignore
-        return gcode_reader.readFromStream(gcode_stream)  # type: ignore
+        return gcode_reader.readFromStream(gcode_stream, file_name)  # type: ignore