diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 276e8f3530..eaa5cbdce9 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent)
         {
+            if (Beatmap.Value == null)
+                return;
+
             if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID))
                 Schedule(() => hasBeatmap = true);
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 360dd1fa07..69a9a2fc66 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.Multi
 
         private void cancelLooping()
         {
-            var track = beatmap.Value.Track;
+            var track = beatmap?.Value?.Track;
             if (track != null)
                 track.Looping = false;
         }