diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index ba25cc1d1a..2fc7731ef5 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -29,13 +29,10 @@ protected override void Update()
                 if (controlPoint != null)
                 {
                     double oldTimingPointStart = timingPointStart;
-                    double beatLength;
+                    double beatLength = controlPoint.BeatLength;
                     int oldBeat = beat;
-                    bool kiai;
-
-                    beatLength = controlPoint.BeatLength;
+                    bool kiai = kiaiControlPoint?.KiaiMode ?? false;
                     timingPointStart = controlPoint.Time;
-                    kiai = kiaiControlPoint?.KiaiMode ?? false;
 
                     beat = beatLength > min_beat_length ? (int)((currentTime - timingPointStart) / beatLength) : 0;
 
@@ -44,7 +41,7 @@ protected override void Update()
                     if (currentTime <= timingPointStart)
                         beat--;
 
-                    if ((timingPointStart != oldTimingPointStart || beat != oldBeat) && (currentTime - timingPointStart) % (beatLength) <= seek_tolerance)
+                    if ((timingPointStart != oldTimingPointStart || beat != oldBeat) && (int)((currentTime - timingPointStart) % beatLength) <= seek_tolerance)
                         OnNewBeat(beat, beatLength, controlPoint.TimeSignature, kiai);
                 }
             }