diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 94b7f00333..2b559d5912 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -260,9 +260,6 @@ namespace osu.Game.Beatmaps
             if (beatmapInfo?.BeatmapSet == null || beatmapInfo == DefaultBeatmap?.BeatmapInfo)
                 return DefaultBeatmap;
 
-            var info = beatmapInfo;
-            beatmapInfo = QueryBeatmap(p => info.OnlineBeatmapID == p.OnlineBeatmapID) ?? beatmapInfo;
-
             if (beatmapInfo.Metadata == null)
                 beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
 
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index 2d19afd98d..5c81779f83 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Beatmaps.Drawables
 {
     /// <summary>
-    /// Display a beatmap background from an online source
+    /// Display a baetmap background from a local source, but fallback to online source if not available.
     /// </summary>
     public class UpdateableBeatmapBackgroundSprite : ModelBackedDrawable<BeatmapInfo>
     {
@@ -20,13 +20,10 @@ namespace osu.Game.Beatmaps.Drawables
 
         private readonly BeatmapSetCoverType beatmapSetCoverType;
 
-        private readonly bool fallback;
-
-        public UpdateableBeatmapBackgroundSprite(bool fallback = false, BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
+        public UpdateableBeatmapBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
         {
             Beatmap.BindValueChanged(b => Model = b.NewValue);
             this.beatmapSetCoverType = beatmapSetCoverType;
-            this.fallback = fallback;
         }
 
         protected override Drawable CreateDrawable(BeatmapInfo model)
@@ -39,7 +36,7 @@ namespace osu.Game.Beatmaps.Drawables
 
                 if (model?.BeatmapSet?.OnlineInfo != null)
                     drawable = new BeatmapSetCover(model.BeatmapSet, beatmapSetCoverType);
-                else if (fallback && localBeatmap.BeatmapInfo.ID != 0)
+                else if (localBeatmap.BeatmapInfo.ID != 0)
                 {
                     // Fall back to local background if one exists
                     drawable = new BeatmapBackgroundSprite(localBeatmap);
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
index 512f79942d..968fa6e72e 100644
--- a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
@@ -9,6 +9,13 @@ namespace osu.Game.Screens.Multi.Components
 {
     public class MultiplayerBackgroundSprite : MultiplayerComposite
     {
+        private readonly BeatmapSetCoverType beatmapSetCoverType;
+
+        public MultiplayerBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
+        {
+            this.beatmapSetCoverType = beatmapSetCoverType;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -19,6 +26,6 @@ namespace osu.Game.Screens.Multi.Components
             CurrentItem.BindValueChanged(item => sprite.Beatmap.Value = item.NewValue?.Beatmap, true);
         }
 
-        protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both };
+        protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite(beatmapSetCoverType) { RelativeSizeAxes = Axes.Both };
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 6a21e8f333..4bab68058f 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                                 Width = cover_width,
                                 Masking = true,
                                 Margin = new MarginPadding { Left = side_strip_width },
-                                Child = new MultiplayerListSprite { RelativeSizeAxes = Axes.Both }
+                                Child = new MultiplayerBackgroundSprite(BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both }
                             },
                             new Container
                             {
@@ -203,11 +203,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             this.FadeInFromZero(transition_duration);
         }
 
-        private class MultiplayerListSprite : MultiplayerBackgroundSprite
-        {
-            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite(beatmapSetCoverType: BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both };
-        }
-
         private class RoomName : OsuSpriteText
         {
             [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Name))]
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs
index dafbb77bc6..6a6a1f274c 100644
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@@ -132,15 +132,10 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
         {
-            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite(true) { RelativeSizeAxes = Axes.Both };
+            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
 
             private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
             {
-                public BackgroundSprite(bool fallback = false, BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
-                    : base(fallback, beatmapSetCoverType)
-                {
-                }
-
                 protected override double FadeDuration => 200;
             }
         }