diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index a45d91801d..6476f8c2de 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -24,12 +24,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite metreSprite;
         private Container metre;
 
+        private bool spinnerBlink;
+
         private const float sprite_scale = 1 / 1.6f;
         private const float final_metre_height = 692 * sprite_scale;
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
+            spinnerBlink = source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value != true;
+
             drawableSpinner = (DrawableSpinner)drawableObject;
 
             RelativeSizeAxes = Axes.Both;
@@ -116,12 +120,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private float getMetreHeight(float progress)
         {
-            progress = Math.Min(99, progress * 100);
+            progress *= 100;
+
+            // the spinner should still blink at 100% progress.
+            if (spinnerBlink)
+                progress = Math.Min(99, progress);
 
             int barCount = (int)progress / 10;
 
-            // todo: add SpinnerNoBlink support
-            if (RNG.NextBool(((int)progress % 10) / 10f))
+            if (spinnerBlink && RNG.NextBool(((int)progress % 10) / 10f))
                 barCount++;
 
             return (float)barCount / total_bars * final_metre_height;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index e034e14eb0..63c9b53278 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         CursorRotate,
         HitCircleOverlayAboveNumber,
         HitCircleOverlayAboveNumer, // Some old skins will have this typo
-        SpinnerFrequencyModulate
+        SpinnerFrequencyModulate,
+        SpinnerNoBlink
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 1d5412d93f..828804b9cb 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
             ComboPrefix,
             ComboOverlap,
             AnimationFramerate,
-            LayeredHitSounds,
+            LayeredHitSounds
         }
     }
 }