diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 5ebca4d860..8a14b8b183 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -133,7 +133,9 @@ private void skinSourceChanged()
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            skin.SourceChanged -= skinSourceChanged;
+
+            if (skin != null)
+                skin.SourceChanged -= skinSourceChanged;
         }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 6622cfb6be..a6f2b8fcbd 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -110,7 +110,9 @@ private void load(TextureStore textureStore, Storyboard storyboard)
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            skin.SourceChanged -= skinSourceChanged;
+
+            if (skin != null)
+                skin.SourceChanged -= skinSourceChanged;
         }
     }
 }