diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index 1936482c90..9695e93f5d 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -22,16 +22,17 @@ namespace osu.Game.Graphics.Backgrounds
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (!Beatmap.Storyboard.HasDrawable)
-                return;
-
             var storyboard = new Storyboard { BeatmapInfo = Beatmap.BeatmapInfo };
+
             foreach (var layer in storyboard.Layers)
             {
                 if (layer.Name != "Fail")
                     layer.Elements = Beatmap.Storyboard.GetLayer(layer.Name).Elements.Where(e => !(e is StoryboardSampleInfo)).ToList();
             }
 
+            if (!storyboard.HasDrawable)
+                return;
+
             if (storyboard.ReplacesBackground)
             {
                 Sprite.Texture = Texture.WhitePixel;