diff --git a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
index 6e2852676a..fc4eef13ba 100644
--- a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
+++ b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
@@ -30,7 +30,7 @@ public static class HitEventExtensions
 
             foreach (var e in hitEvents)
             {
-                if (!affectsUnstableRate(e))
+                if (!AffectsUnstableRate(e))
                     continue;
 
                 count++;
@@ -57,7 +57,7 @@ public static class HitEventExtensions
         /// </returns>
         public static double? CalculateAverageHitError(this IEnumerable<HitEvent> hitEvents)
         {
-            double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset).ToArray();
+            double[] timeOffsets = hitEvents.Where(AffectsUnstableRate).Select(ev => ev.TimeOffset).ToArray();
 
             if (timeOffsets.Length == 0)
                 return null;
@@ -65,6 +65,6 @@ public static class HitEventExtensions
             return timeOffsets.Average();
         }
 
-        private static bool affectsUnstableRate(HitEvent e) => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit();
+        public static bool AffectsUnstableRate(HitEvent e) => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit();
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index f312fb0ec5..74b887481f 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -195,7 +195,10 @@ private void scoreChanged(ValueChangedEvent<ScoreInfo?> score)
                 },
             };
 
-            if (hitEvents.Count < 10)
+            // affecting unstable rate here is used as a substitute of determining if a hit event represents a *timed* hit event,
+            // i.e. an user input that the user had to *time to the track*,
+            // i.e. one that it *makes sense to use* when doing anything with timing and offsets.
+            if (hitEvents.Count(HitEventExtensions.AffectsUnstableRate) < 10)
             {
                 referenceScoreContainer.AddRange(new Drawable[]
                 {