diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
index 1d3153915f..00bcfaffdb 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
@@ -16,6 +16,7 @@
 using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osuTK;
 
@@ -33,6 +34,12 @@ public partial class BeatmapSelectGrid : CompositeDrawable
 
         public event Action<MultiplayerPlaylistItem>? ItemSelected;
 
+        [Resolved]
+        private ScreenMatchmaking? matchmakingScreen { get; set; }
+
+        [Resolved]
+        private MultiplayerClient client { get; set; } = null!;
+
         private readonly Dictionary<long, BeatmapSelectPanel> panelLookup = new Dictionary<long, BeatmapSelectPanel>();
 
         private readonly PanelGridContainer panelGridContainer;
@@ -151,7 +158,8 @@ public void RollAndDisplayFinalBeatmap(long[] candidateItemIds, long finalItemId
                 this.Delay(ARRANGE_DELAY)
                     .Schedule(() => ArrangeItemsForRollAnimation())
                     .Delay(arrange_duration + present_beatmap_delay)
-                    .Schedule(() => PresentUnanimouslyChosenBeatmap(finalItemId));
+                    .Schedule(() => PresentUnanimouslyChosenBeatmap(finalItemId))
+                    .Schedule(() => setBeatmap(finalItemId));
             }
             else
             {
@@ -160,7 +168,8 @@ public void RollAndDisplayFinalBeatmap(long[] candidateItemIds, long finalItemId
                     .Delay(arrange_duration)
                     .Schedule(() => PlayRollAnimation(finalItemId, roll_duration))
                     .Delay(roll_duration + present_beatmap_delay)
-                    .Schedule(() => PresentRolledBeatmap(finalItemId));
+                    .Schedule(() => PresentRolledBeatmap(finalItemId))
+                    .Schedule(() => setBeatmap(finalItemId));
             }
         }
 
@@ -341,6 +350,16 @@ internal void PresentUnanimouslyChosenBeatmap(long finalItem)
             PresentRolledBeatmap(finalItem);
         }
 
+        private void setBeatmap(long playlistItemId)
+        {
+            MultiplayerPlaylistItem? item = client.Room?.Playlist.SingleOrDefault(item => item.ID == playlistItemId);
+
+            if (item == null)
+                return;
+
+            matchmakingScreen?.SetPlaylistItem(item);
+        }
+
         private partial class PanelGridContainer : FillFlowContainer<BeatmapSelectPanel>
         {
             public bool LayoutDisabled;
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/ScreenMatchmaking.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/ScreenMatchmaking.cs
index c16cf5cb99..35f255d98e 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/ScreenMatchmaking.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/ScreenMatchmaking.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
     /// <summary>
     /// The main matchmaking screen which houses a custom <see cref="ScreenStack"/> through the life cycle of a single session.
     /// </summary>
+    [Cached]
     public partial class ScreenMatchmaking : OsuScreen, IPreviewTrackOwner
     {
         /// <summary>
@@ -225,19 +226,8 @@ private void updateGameplayState()
             if (item.Expired)
                 return;
 
-            RulesetInfo ruleset = rulesets.GetRuleset(item.RulesetID)!;
-            Ruleset rulesetInstance = ruleset.CreateInstance();
-
-            // Update global gameplay state to correspond to the new selection.
-            // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
-            var localBeatmap = beatmapManager.QueryBeatmap($@"{nameof(BeatmapInfo.OnlineID)} == $0 AND {nameof(BeatmapInfo.MD5Hash)} == {nameof(BeatmapInfo.OnlineMD5Hash)}", item.BeatmapID);
-
-            if (localBeatmap != null)
+            if (SetPlaylistItem(item))
             {
-                Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
-                Ruleset.Value = ruleset;
-                Mods.Value = item.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
-
                 // Notify the server that the beatmap has been set and that we are ready to start gameplay.
                 if (client.LocalUser!.State == MultiplayerUserState.Idle)
                     client.ChangeState(MultiplayerUserState.Ready).FireAndForget();
@@ -252,6 +242,29 @@ private void updateGameplayState()
             client.ChangeBeatmapAvailability(beatmapAvailabilityTracker.Availability.Value).FireAndForget();
         }
 
+        /// <summary>
+        /// Attempts to set the global beatmap from the given playlist item.
+        /// </summary>
+        /// <param name="item">The playlist item.</param>
+        /// <returns><c>true</c> if the beatmap exists locally and was set, <c>false</c> otherwise.</returns>
+        public bool SetPlaylistItem(MultiplayerPlaylistItem item)
+        {
+            RulesetInfo ruleset = rulesets.GetRuleset(item.RulesetID)!;
+            Ruleset rulesetInstance = ruleset.CreateInstance();
+
+            // Update global gameplay state to correspond to the new selection.
+            // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
+            var localBeatmap = beatmapManager.QueryBeatmap($@"{nameof(BeatmapInfo.OnlineID)} == $0 AND {nameof(BeatmapInfo.MD5Hash)} == {nameof(BeatmapInfo.OnlineMD5Hash)}", item.BeatmapID);
+            if (localBeatmap == null)
+                return false;
+
+            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+            Ruleset.Value = ruleset;
+            Mods.Value = item.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+
+            return true;
+        }
+
         private void onLoadRequested() => Scheduler.Add(() =>
         {
             updateGameplayState();