diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 963cf37fea..c3b6dde44b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -2,13 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -16,18 +15,10 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardAnimation : SkinReloadableDrawable, IFlippable, IVectorScalable
+    public class DrawableStoryboardAnimation : DrawableAnimation, IFlippable, IVectorScalable
     {
         public StoryboardAnimation Animation { get; }
 
-        private TextureAnimation drawableTextureAnimation;
-
-        [Resolved]
-        private TextureStore storyboardTextureStore { get; set; }
-
-        private readonly List<string> texturePathsRaw = new List<string>();
-        private readonly List<string> texturePaths = new List<string>();
-
         private bool flipH;
 
         public bool FlipH
@@ -119,48 +110,31 @@ namespace osu.Game.Storyboards.Drawables
             Animation = animation;
             Origin = animation.Origin;
             Position = animation.InitialPosition;
+            Loop = animation.LoopType == AnimationLoopType.LoopForever;
 
             LifetimeStart = animation.StartTime;
             LifetimeEnd = animation.EndTime;
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            InternalChild = drawableTextureAnimation = new TextureAnimation
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Loop = Animation.LoopType == AnimationLoopType.LoopForever
-            };
-
             for (var frame = 0; frame < Animation.FrameCount; frame++)
             {
                 var framePath = Animation.Path.Replace(".", frame + ".");
-                texturePathsRaw.Add(Path.GetFileNameWithoutExtension(framePath));
 
-                var path = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-                texturePaths.Add(path);
+                var storyboardPath = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+                var frameSprite = storyboardPath != null
+                    ? (Drawable)new Sprite
+                    {
+                        Texture = textureStore.Get(storyboardPath)
+                    }
+                    : new SkinnableSprite(framePath); // fall back to skin textures if not found in storyboard files.
+
+                AddFrame(frameSprite, Animation.FrameDelay);
             }
 
             Animation.ApplyTransforms(this);
         }
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            drawableTextureAnimation.ClearFrames();
-
-            for (var frame = 0; frame < Animation.FrameCount; frame++)
-            {
-                var texture = skin?.GetTexture(texturePathsRaw[frame]) ?? storyboardTextureStore?.Get(texturePaths[frame]);
-
-                if (texture == null)
-                    continue;
-
-                drawableTextureAnimation.AddFrame(texture, Animation.FrameDelay);
-            }
-        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index cd09cafbce..95774de898 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
@@ -15,17 +15,10 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardSprite : SkinReloadableDrawable, IFlippable, IVectorScalable
+    public class DrawableStoryboardSprite : CompositeDrawable, IFlippable, IVectorScalable
     {
         public StoryboardSprite Sprite { get; }
 
-        private Sprite drawableSprite;
-
-        [Resolved]
-        private TextureStore storyboardTextureStore { get; set; }
-
-        private string texturePath;
-
         private bool flipH;
 
         public bool FlipH
@@ -123,29 +116,19 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            InternalChild = drawableSprite = new Sprite
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
-            };
+            var storyboardPath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+            var sprite = storyboardPath != null
+                ? (Drawable)new Sprite
+                {
+                    Texture = textureStore.Get(storyboardPath)
+                }
+                : new SkinnableSprite(Sprite.Path); // fall back to skin textures if not found in storyboard files.
 
-            texturePath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+            InternalChild = sprite.With(s => s.Anchor = s.Origin = Anchor.Centre);
 
             Sprite.ApplyTransforms(this);
         }
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            var newTexture = skin?.GetTexture(Path.GetFileNameWithoutExtension(Sprite.Path)) ?? storyboardTextureStore?.Get(texturePath);
-
-            if (drawableSprite.Texture == newTexture) return;
-
-            drawableSprite.Size = Vector2.Zero; // Sprite size needs to be recalculated (e.g. aspect ratio of combo number textures may differ between skins)
-            drawableSprite.Texture = newTexture;
-        }
     }
 }