diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index d5826e85b0..f064d53358 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -104,8 +104,11 @@ namespace osu.Game.Beatmaps.ControlPoints
             if (time < list[0].Time)
                 return prePoint ?? new T();
 
+            if (time >= list[list.Count - 1].Time)
+                return list[list.Count - 1];
+
             int l = 0;
-            int r = list.Count - 1;
+            int r = list.Count - 2;
 
             while (l <= r)
             {