diff --git a/osu.Game/Beatmaps/BeatmapProcessor.cs b/osu.Game/Beatmaps/BeatmapProcessor.cs
index 250cc49ad4..b7b5adc52e 100644
--- a/osu.Game/Beatmaps/BeatmapProcessor.cs
+++ b/osu.Game/Beatmaps/BeatmapProcessor.cs
@@ -22,8 +22,18 @@ namespace osu.Game.Beatmaps
         {
             IHasComboInformation lastObj = null;
 
+            bool isFirst = true;
+
             foreach (var obj in Beatmap.HitObjects.OfType<IHasComboInformation>())
             {
+                if (isFirst)
+                {
+                    obj.NewCombo = true;
+
+                    // first hitobject should always be marked as a new combo for sanity.
+                    isFirst = false;
+                }
+
                 if (obj.NewCombo)
                 {
                     obj.IndexInCurrentCombo = 0;