diff --git a/osu-framework b/osu-framework
index 6b44a9f807..a7edf9bb3b 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 6b44a9f807fadcb3b3f044780d7e27d62ffe80ac
+Subproject commit a7edf9bb3bae6908f316ba0ee9dacdbbb66e8c19
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 939c4a4915..99b015dd79 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -133,9 +133,20 @@ namespace osu.Game
                 Token = LocalConfig.Get<string>(OsuSetting.Token)
             });
 
+            Beatmap.ValueChanged += b =>
+            {
+                // this disposal is done to stop the audio track.
+                // it may not be exactly what we want for cases beatmaps are reused, as it will
+                // trigger a fresh load of contained resources.
+                lastBeatmap?.Dispose();
+                lastBeatmap = b;
+            };
+
             API.Register(this);
         }
 
+        private WorkingBeatmap lastBeatmap;
+
         public void APIStateChanged(APIAccess api, APIState state)
         {
             switch (state)
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 87c0afebf7..e936fa6209 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Music
             Task.Run(() =>
             {
                 var track = beatmapBacking.Value.Track;
-                trackManager.SetExclusive(track);
+                trackManager.AddItem(track);
                 track.Start();
             }).ContinueWith(task => Schedule(task.ThrowIfFaulted), TaskContinuationOptions.OnlyOnFaulted);
         }
diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs
index aeb5282666..0998a4e64c 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/Intro.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
             Beatmap.Value = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
 
             track = Beatmap.Value.Track;
-            trackManager.SetExclusive(track);
+            trackManager.AddItem(track);
 
             welcome = audio.Sample.Get(@"welcome");
             seeya = audio.Sample.Get(@"seeya");
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 40f24a77c9..ea163bca3a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Screens.Play
 
             if (track != null)
             {
-                audio.Track.SetExclusive(track);
+                audio.Track.AddItem(track);
                 adjustableSourceClock = track;
             }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ea012f45e4..7e50ab6e2b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -358,7 +358,7 @@ namespace osu.Game.Screens.Select
         {
             Track track = Beatmap.Value.Track;
 
-            trackManager.SetExclusive(track);
+            trackManager.AddItem(track);
 
             if (preview) track.Seek(Beatmap.Value.Metadata.PreviewTime);
             track.Start();