diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index e887295f4a..4155121bdf 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Online.Multiplayer
         public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
         {
             // If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
-            // Todo: Is this a bug?
+            // Todo: Is this a bug? Room creation only returns the beatmap ID
             Beatmap = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
             Ruleset = rulesets.GetRuleset(RulesetID);
 
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index d7898297c9..924bf75809 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -95,6 +95,8 @@ namespace osu.Game.Online.Multiplayer
             // Todo: Temporary, should only remove/add new items (requires framework changes)
             if (Playlist.Count == 0)
                 Playlist.AddRange(other.Playlist);
+            else if (other.Playlist.Count > 0)
+                Playlist.First().ID = other.Playlist.First().ID;
         }
 
         public bool ShouldSerializeRoomID() => false;
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index c24ef4664f..552f24df8a 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -154,7 +154,9 @@ namespace osu.Game.Screens.Multi
         {
             foreach (var pi in remote.Playlist)
                 pi.MapObjects(beatmaps, rulesets);
-            local.CopyFrom(remote);
+
+            if (local != remote)
+                local.CopyFrom(remote);
         }
 
         /// <summary>