diff --git a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py
index 94628cd2d4..69b1e51247 100644
--- a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py
+++ b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py
@@ -136,7 +136,17 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
             file_in_archive.compress_type = zipfile.ZIP_DEFLATED
 
             # Do not include the network authentication keys
-            ignore_keys = {"network_authentication_id", "network_authentication_key", "octoprint_api_key"}
+            ignore_keys = {
+                "um_cloud_cluster_id",
+                "um_network_key",
+                "um_linked_to_account",
+                "removal_warning",
+                "host_guid",
+                "group_name",
+                "group_size",
+                "connection_type",
+                "octoprint_api_key"
+            }
             serialized_data = container.serialize(ignored_metadata_keys = ignore_keys)
 
             archive.writestr(file_in_archive, serialized_data)
diff --git a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
index 93edab4d58..d3aefa2733 100644
--- a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
+++ b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
@@ -25,6 +25,18 @@ _removed_settings = {
     "support_tree_enable"
 }  # type: Set[str]
 
+_removed_machine_network_metadata = {
+    "um_cloud_cluster_id",
+    "um_network_key",
+    "um_linked_to_account",
+    "host_guid",
+    "removal_warning",
+    "group_name",
+    "group_size",
+    "connection_type"
+}  # type: Set[str]
+
+
 class VersionUpgrade462to47(VersionUpgrade):
     def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
         """
@@ -136,6 +148,11 @@ class VersionUpgrade462to47(VersionUpgrade):
             parser["metadata"] = {}
         parser["metadata"]["setting_version"] = "15"
 
+        # Remove machine network information from project file
+        for network_info in _removed_machine_network_metadata:
+            if network_info in parser["metadata"]:
+                del parser["metadata"][network_info]
+
         # Update Pause at Height script parameters if present.
         if "post_processing_scripts" in parser["metadata"]:
             new_scripts_entries = []