diff --git a/osu.Game.Rulesets.Mania/Timing/TimingChangeContainer.cs b/osu.Game.Rulesets.Mania/Timing/TimingChangeContainer.cs
index 2fdd365ab7..8acbe6d24c 100644
--- a/osu.Game.Rulesets.Mania/Timing/TimingChangeContainer.cs
+++ b/osu.Game.Rulesets.Mania/Timing/TimingChangeContainer.cs
@@ -39,6 +39,6 @@ namespace osu.Game.Rulesets.Mania.Timing
         /// </summary>
         /// <param name="hitObject">The hit object to contain.</param>
         /// <returns>The last timing change which can contain <paramref name="hitObject"/>.</returns>
-        private DrawableTimingChange timingChangeFor(DrawableHitObject hitObject) => Children.LastOrDefault(c => c.CanContain(hitObject));
+        private DrawableTimingChange timingChangeFor(DrawableHitObject hitObject) => Children.LastOrDefault(c => c.CanContain(hitObject)) ?? Children.FirstOrDefault();
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
index a250c56944..9c698225ec 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mania.Timing;
+using osu.Game.Rulesets.Mania.Timing.Drawable;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -88,6 +89,7 @@ namespace osu.Game.Rulesets.Mania.UI
             };
 
             timingChanges.ForEach(t => playfield.Columns.ForEach(c => c.Add(new DrawableScrollingTimingChange(t))));
+            timingChanges.ForEach(t => playfield.Add(new DrawableScrollingTimingChange(t)));
 
             return playfield;
         }