diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index d2360f8c2a..675b32c5e2 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -3924,12 +3924,6 @@ nm_keyfile_write (NMConnection *connection,
 				goto out_with_info_error;
 		}
 
-		if (NM_IS_SETTING_WIREGUARD (setting)) {
-			_write_setting_wireguard (setting, &info);
-			if (info.error)
-				goto out_with_info_error;
-		}
-
 		setting_alias = nm_keyfile_plugin_get_alias_for_setting_name (setting_name);
 		if (   (   setting_alias
 		        && g_key_file_has_group (info.keyfile, setting_alias))
@@ -3942,6 +3936,12 @@ nm_keyfile_write (NMConnection *connection,
 			g_key_file_remove_key (info.keyfile, setting_alias ?: setting_name, ".X", NULL);
 		}
 
+		if (NM_IS_SETTING_WIREGUARD (setting)) {
+			_write_setting_wireguard (setting, &info);
+			if (info.error)
+				goto out_with_info_error;
+		}
+
 		nm_assert (!info.error);
 	}