diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index e78a93396e..75cebb275f 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Threading;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
@@ -74,15 +73,14 @@ namespace osu.Game.Graphics.Backgrounds
 
         public void UnloadStoryboard(Action<DrawableStoryboard> scheduleStoryboardRemoval)
         {
-            Debug.Assert(drawableStoryboard != null);
+            if (drawableStoryboard == null)
+                return;
 
             loadCancellationSource.AsNonNull().Cancel();
             loadCancellationSource = null;
 
-            DrawableStoryboard s = drawableStoryboard;
-
             storyboardContainer.FadeOut(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
-            scheduleStoryboardRemoval(s);
+            scheduleStoryboardRemoval(drawableStoryboard);
 
             drawableStoryboard = null;
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 66835363b4..e22f61d806 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -5,7 +5,6 @@
 
 using System.Diagnostics;
 using System.Threading;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;