diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 3c7ead09af..deaa566864 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -163,20 +163,17 @@ namespace osu.Game.Rulesets.Catch.Objects
             int indexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
             int inCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
 
-            // For the purpose of combo colours, spinners never start a new combo even if they are flagged as doing so.
-            if (this is not BananaShower)
+            // - For the purpose of combo colours, spinners never start a new combo even if they are flagged as doing so.
+            // - At decode time, the first hitobject in the beatmap and the first hitobject after a banana shower are both enforced to be a new combo,
+            //   but this isn't directly enforced by the editor so the extra checks against the last hitobject are duplicated here.
+            if (this is not BananaShower && (NewCombo || lastObj == null || lastObj is BananaShower))
             {
-                // At decode time, the first hitobject in the beatmap and the first hitobject after a banana shower are both enforced to be a new combo,
-                // but this isn't directly enforced by the editor so the extra checks against the last hitobject are duplicated here.
-                if (NewCombo || lastObj == null || lastObj is BananaShower)
-                {
-                    inCurrentCombo = 0;
-                    index++;
-                    indexWithOffsets += ComboOffset + 1;
+                inCurrentCombo = 0;
+                index++;
+                indexWithOffsets += ComboOffset + 1;
 
-                    if (lastObj != null)
-                        lastObj.LastInCombo = true;
-                }
+                if (lastObj != null)
+                    lastObj.LastInCombo = true;
             }
 
             ComboIndex = index;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 937e0bda23..9623d1999b 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -188,20 +188,17 @@ namespace osu.Game.Rulesets.Osu.Objects
             int indexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
             int inCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
 
-            // For the purpose of combo colours, spinners never start a new combo even if they are flagged as doing so.
-            if (this is not Spinner)
+            // - For the purpose of combo colours, spinners never start a new combo even if they are flagged as doing so.
+            // - At decode time, the first hitobject in the beatmap and the first hitobject after a spinner are both enforced to be a new combo,
+            //   but this isn't directly enforced by the editor so the extra checks against the last hitobject are duplicated here.
+            if (this is not Spinner && (NewCombo || lastObj == null || lastObj is Spinner))
             {
-                // At decode time, the first hitobject in the beatmap and the first hitobject after a spinner are both enforced to be a new combo,
-                // but this isn't directly enforced by the editor so the extra checks against the last hitobject are duplicated here.
-                if (NewCombo || lastObj == null || lastObj is Spinner)
-                {
-                    inCurrentCombo = 0;
-                    index++;
-                    indexWithOffsets += ComboOffset + 1;
+                inCurrentCombo = 0;
+                index++;
+                indexWithOffsets += ComboOffset + 1;
 
-                    if (lastObj != null)
-                        lastObj.LastInCombo = true;
-                }
+                if (lastObj != null)
+                    lastObj.LastInCombo = true;
             }
 
             ComboIndex = index;