diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 2acabe2518..e5567b2215 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -111,12 +111,12 @@ namespace osu.Game.Beatmaps.Formats
         {
             difficulty.DrainRate = Math.Clamp(difficulty.DrainRate, 0, 10);
             //If the mode is not Mania, clamp circle size to [0,10]
-            if (!beatmap.BeatmapInfo.Ruleset.OnlineID.Equals(3))
+            if (beatmap.BeatmapInfo.Ruleset.OnlineID != 3)
                 difficulty.CircleSize = Math.Clamp(difficulty.CircleSize, 0, 10);
-            //If it is Mania, it must be within [1,20] - dual stages with 10 keys each.
+            //If it is Mania, it must be within [1,18] - copying what stable does https://github.com/ppy/osu/pull/28200#discussion_r1609522988
             //The lower bound should be 4, but there are ranked maps that are lower than this.
             else
-                difficulty.CircleSize = Math.Clamp(difficulty.CircleSize, 1, 20);
+                difficulty.CircleSize = Math.Clamp(difficulty.CircleSize, 1, 18);
             difficulty.OverallDifficulty = Math.Clamp(difficulty.OverallDifficulty, 0, 10);
             difficulty.ApproachRate = Math.Clamp(difficulty.ApproachRate, 0, 10);
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index 1d3416f494..2a5a11161b 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
             const float broken_gamefield_rounding_allowance = 1.00041f;
 
-            return (float)Math.Max(0.02, (1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * (applyFudge ? broken_gamefield_rounding_allowance : 1));
+            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * (applyFudge ? broken_gamefield_rounding_allowance : 1);
         }
 
         public static int CalculateDifficultyPeppyStars(BeatmapDifficulty difficulty, int objectCount, int drainLength)