diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 82844af3c5..c2b9727309 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -458,11 +458,17 @@ namespace osu.Game.Online.Multiplayer
                 {
                     GetAPIBeatmap(playlistItem.BeatmapID).ContinueWith(b =>
                     {
-                        Scheduler.Add(() => playlistItem.Beatmap.Value = b.Result);
-                    }, TaskContinuationOptions.OnlyOnRanToCompletion);
-                }
+                        bool success = b.IsCompletedSuccessfully;
 
-                updateLocalRoomSettings(newSettings);
+                        Scheduler.Add(() =>
+                        {
+                            if (success)
+                                playlistItem.Beatmap.Value = b.Result;
+
+                            updateLocalRoomSettings(newSettings);
+                        });
+                    });
+                }
             });
 
             return Task.CompletedTask;