diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index e2c4657057..dab5fcbe5f 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -148,8 +148,12 @@ namespace osu.Game.Audio
                 if (dataStream == null)
                     return null;
 
-                Track track = new TrackBass(dataStream, (IBassAudioMixer)defaultMixer);
+                // Todo: This is quite unsafe. TrackBass shouldn't be exposed as public.
+                Track track = new TrackBass(dataStream);
+
+                defaultMixer.Add(track);
                 AddItem(track);
+
                 return track;
             }
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 242c3298e8..57e400a77e 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -10,7 +10,6 @@ using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Mixing;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -291,7 +290,6 @@ namespace osu.Game.Tests.Visual
                 private bool running;
 
                 public TrackVirtualManual(IFrameBasedClock referenceClock)
-                    : base(new NullAudioMixer())
                 {
                     this.referenceClock = referenceClock;
                     Length = double.PositiveInfinity;