diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 47d1bef177..6adfa1817e 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -65,20 +65,12 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        [NotNull]
-        private readonly TrackContainer trackContainer;
-
         [CanBeNull]
         public DrawableTrack CurrentTrack { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
-        public MusicController()
-        {
-            InternalChild = trackContainer = new TrackContainer { RelativeSizeAxes = Axes.Both };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -337,8 +329,10 @@ namespace osu.Game.Overlays
 
             if (current != null)
             {
-                trackContainer.Add(CurrentTrack = new DrawableTrack(current.GetRealTrack()));
+                CurrentTrack = new DrawableTrack(current.GetRealTrack());
                 CurrentTrack.Completed += () => onTrackCompleted(current);
+
+                AddInternal(CurrentTrack);
             }
         }
 
@@ -433,10 +427,6 @@ namespace osu.Game.Overlays
             {
             }
         }
-
-        private class TrackContainer : AudioContainer<DrawableTrack>
-        {
-        }
     }
 
     public enum TrackChangeDirection