diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 621fc100c2..2346a55bbe 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int IndexInBeatmap { get; set; }
 
-        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);
+        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(ComboIndex % 4);
 
         public virtual bool NewCombo { get; set; }
 
diff --git a/osu.Game/Beatmaps/BeatmapProcessor.cs b/osu.Game/Beatmaps/BeatmapProcessor.cs
index 9d7cd673dc..84bf6ada18 100644
--- a/osu.Game/Beatmaps/BeatmapProcessor.cs
+++ b/osu.Game/Beatmaps/BeatmapProcessor.cs
@@ -44,6 +44,15 @@ namespace osu.Game.Beatmaps
 
         public virtual void PostProcess()
         {
+            foreach (var hitObject in Beatmap.HitObjects)
+            {
+                var objectComboInfo = (IHasComboInformation)hitObject;
+                foreach (var obj in hitObject.NestedHitObjects.OfType<IHasComboInformation>())
+                {
+                    obj.IndexInCurrentCombo = objectComboInfo.IndexInCurrentCombo;
+                    obj.ComboIndex = objectComboInfo.ComboIndex;
+                }
+            }
         }
     }
 }