diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
index 0bd5fd4cac..44962c8548 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
@@ -35,14 +35,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public void SetRotation(float currentRotation)
         {
-            // Never calculate SPM by same time of record to avoid 0 / 0 = NaN or X / 0 = Infinity result.
-            if (Precision.AlmostEquals(0, Time.Elapsed))
-                return;
-
             // If we've gone back in time, it's fine to work with a fresh set of records for now
             if (records.Count > 0 && Time.Current < records.Last().Time)
                 records.Clear();
 
+            // Never calculate SPM by same time of record to avoid 0 / 0 = NaN or X / 0 = Infinity result.
+            if (records.Count > 0 && Precision.AlmostEquals(Time.Current, records.Last().Time))
+                return;
+
             if (records.Count > 0)
             {
                 var record = records.Peek();