diff --git a/osu.Game/Screens/Play/SongProgressGraph.cs b/osu.Game/Screens/Play/SongProgressGraph.cs
index 9251ca33a4..541065e532 100644
--- a/osu.Game/Screens/Play/SongProgressGraph.cs
+++ b/osu.Game/Screens/Play/SongProgressGraph.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
                     return;
 
                 var firstHit = objects.First().StartTime;
-                var lastHit = (objects.Last() as IHasEndTime)?.EndTime ?? 0;
+                var lastHit = objects.Max(o => (o as IHasEndTime)?.EndTime ?? o.StartTime);
 
                 if (lastHit == 0)
                     lastHit = objects.Last().StartTime;