diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index f0af09459f..ec75c1a1fb 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -45,24 +45,7 @@ protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Drawable content,
 
         protected override Drawable CreateDrawable(BeatmapInfo model)
         {
-            Drawable drawable;
-
-            var localBeatmap = beatmaps.GetWorkingBeatmap(model);
-
-            if (model?.BeatmapSet?.OnlineInfo != null)
-            {
-                drawable = new BeatmapSetCover(model.BeatmapSet, beatmapSetCoverType);
-            }
-            else if (localBeatmap.BeatmapInfo.ID != 0)
-            {
-                // Fall back to local background if one exists
-                drawable = new BeatmapBackgroundSprite(localBeatmap);
-            }
-            else
-            {
-                // Use the default background if somehow an online set does not exist and we don't have a local copy.
-                drawable = new BeatmapBackgroundSprite(beatmaps.DefaultBeatmap);
-            }
+            Drawable drawable = getDrawableForModel(model);
 
             drawable.RelativeSizeAxes = Axes.Both;
             drawable.Anchor = Anchor.Centre;
@@ -72,5 +55,16 @@ protected override Drawable CreateDrawable(BeatmapInfo model)
 
             return drawable;
         }
+
+        private Drawable getDrawableForModel(BeatmapInfo model)
+        {
+            // prefer online cover where available.
+            if (model?.BeatmapSet?.OnlineInfo != null)
+                return new BeatmapSetCover(model.BeatmapSet, beatmapSetCoverType);
+
+            return model?.ID > 0
+                ? new BeatmapBackgroundSprite(beatmaps.GetWorkingBeatmap(model))
+                : new BeatmapBackgroundSprite(beatmaps.DefaultBeatmap);
+        }
     }
 }