diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 18e5379224..d96bb40165 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -237,11 +237,8 @@ namespace osu.Game.Overlays
 
         protected override void LoadComplete()
         {
-            beatmap.ValueChanged += beatmapChanged;
-            beatmap.DisabledChanged += beatmapDisabledChanged;
-
-            beatmapChanged(beatmap.Value);
-
+            beatmap.BindValueChanged(beatmapChanged, true);
+            beatmap.BindDisabledChanged(beatmapDisabledChanged, true);
             base.LoadComplete();
         }
 
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
index dfc6b41432..cc51ae1096 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
@@ -47,9 +47,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
         private void load(IBindableBeatmap beatmap)
         {
             this.beatmap.BindTo(beatmap);
-
-            beatmap.ValueChanged += beatmapChanged;
-            beatmapChanged(beatmap.Value);
+            this.beatmap.BindValueChanged(beatmapChanged, true);
         }
 
         private void beatmapChanged(WorkingBeatmap beatmap) => waveform.Beatmap = beatmap;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b04ffecf48..70b473bcd9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -207,10 +207,8 @@ namespace osu.Game.Screens.Select
 
             Carousel.BeatmapSets = this.beatmaps.GetAllUsableBeatmapSetsEnumerable();
 
-            Beatmap.DisabledChanged += disabled => Carousel.AllowSelection = !disabled;
-            Beatmap.ValueChanged += workingBeatmapChanged;
-
-            workingBeatmapChanged(Beatmap.Value);
+            Beatmap.BindDisabledChanged(disabled => Carousel.AllowSelection = !disabled, true);
+            Beatmap.BindValueChanged(workingBeatmapChanged);
         }
 
         public void Edit(BeatmapInfo beatmap)
diff --git a/osu.Game/Tests/Visual/EditorClockTestCase.cs b/osu.Game/Tests/Visual/EditorClockTestCase.cs
index 0363fa75ba..08dc6a3bbd 100644
--- a/osu.Game/Tests/Visual/EditorClockTestCase.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestCase.cs
@@ -32,8 +32,7 @@ namespace osu.Game.Tests.Visual
             Dependencies.CacheAs<IFrameBasedClock>(Clock);
             Dependencies.CacheAs<IAdjustableClock>(Clock);
 
-            Beatmap.ValueChanged += beatmapChanged;
-            beatmapChanged(Beatmap.Value);
+            Beatmap.BindValueChanged(beatmapChanged, true);
         }
 
         private void beatmapChanged(WorkingBeatmap working)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2300ba6a72..1e97fb6a68 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.606.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.607.0" />
     <PackageReference Include="SharpCompress" Version="0.18.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />