diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 6a2610ae05..e02ded979f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (hitObject is DrawableSpinner spinner)
                 {
-                    spinner.Disc.Trackable = false;
+                    spinner.Disc.Enabled = false;
                     spinner.Disc.OnUpdate += d =>
                     {
                         var s = d as SpinnerDisc;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2930134d4f..de11ab6419 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && (Disc.Tracking || !Disc.Trackable))
+            if (!SpmCounter.IsPresent && Disc.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
             base.Update();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 4e2758b3d5..b062fc5afa 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             get => tracking;
             set
             {
-                if (value == tracking) return;
+                if ((Enabled && value) == tracking) return;
 
-                tracking = value;
+                tracking = Enabled && value;
 
                 background.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
             }
@@ -74,7 +74,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         }
 
         public bool Valid => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
-        public bool Trackable { get; set; } = true;
+
+        public bool Enabled { get; set; } = true;
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
@@ -100,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             var delta = thisAngle - lastAngle;
 
-            if (Valid && tracking && Trackable)
+            if (Valid && tracking)
                 Rotate(delta);
 
             lastAngle = thisAngle;