diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index df3afb7063..8cd6676f9d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -50,10 +50,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                    {
-                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
                         head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
-                    }
 
                     break;
             }
@@ -71,8 +68,16 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             foreach (var obj in drawables)
             {
-                if (obj is DrawableSlider slider)
-                    slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                switch (obj)
+                {
+                    case DrawableSlider slider:
+                        slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                        break;
+
+                    case DrawableSliderHead head:
+                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        break;
+                }
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 08e9c5eb14..ee1df00ef7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
 
+        /// <summary>
+        /// Makes this <see cref="DrawableSliderHead"/> track the follow circle when the start time is reached.
+        /// If <c>false</c>, this <see cref="DrawableSliderHead"/> will be pinned to its initial position in the slider.
+        /// </summary>
+        public bool TrackFollowCircle = true;
+
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -66,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Debug.Assert(Slider != null);
             Debug.Assert(HitObject != null);
 
-            if (HitObject.TrackFollowCircle)
+            if (TrackFollowCircle)
             {
                 double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 13eac60300..28e57567cb 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -8,12 +8,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
-        /// <summary>
-        /// Makes this <see cref="SliderHeadCircle"/> track the follow circle when the start time is reached.
-        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be pinned to its initial position in the slider.
-        /// </summary>
-        public bool TrackFollowCircle = true;
-
         /// <summary>
         /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
         /// If <c>false</c>, judgement will be ignored.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index e9b4bb416c..8eb2714c04 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (drawableSlider.HitObject == null)
                 return;
 
-            if (!drawableSlider.HitObject.HeadCircle.TrackFollowCircle)
+            if (!drawableSlider.HeadCircle.TrackFollowCircle)
             {
                 // When not tracking the follow circle, force the path to not snake out as it looks better that way.
                 SnakingOut.UnbindFrom(snakingOut);