diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index efbafdc17a..62df4989ba 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -13,12 +16,26 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
+        private Sprite spin;
+
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject)
+        private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
             RelativeSizeAxes = Axes.Both;
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            AddRangeInternal(new[]
+            {
+                spin = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Texture = source.GetTexture("spinner-spin"),
+                    Y = 120 // todo: make match roughly?
+                },
+            });
         }
 
         protected override void LoadComplete()
@@ -31,6 +48,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         protected virtual void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
+            switch (drawableHitObject)
+            {
+                case DrawableSpinner d:
+                    double fadeOutLength = Math.Min(400, d.HitObject.Duration);
+
+                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - fadeOutLength, true))
+                        spin.FadeOutFromOne(fadeOutLength);
+
+                    break;
+
+                case DrawableSpinnerTick d:
+                    if (state == ArmedState.Hit)
+                    {
+                        using (BeginAbsoluteSequence(d.HitStateUpdateTime, true))
+                            spin.FadeOut(300);
+                    }
+
+                    break;
+            }
         }
 
         protected override void Dispose(bool isDisposing)