diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 0825e936ee..1a8f8fcb06 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Music
             }
             set
             {
-                if (!IsLoaded || allowBeatmapChange == value) return;
+                if (allowBeatmapChange == value) return;
 
                 allowBeatmapChange = value;
 
@@ -66,8 +66,7 @@ namespace osu.Game.Overlays.Music
                 list.Filter(filter.Search.Text);
 
                 // Select the current beatmap
-                if (beatmapBacking.Value != null)
-                    list.SelectedItem = beatmapBacking.Value.BeatmapSetInfo;
+                list.SelectedItem = beatmapBacking.Value?.BeatmapSetInfo;
             }
         }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index f0d79534af..12b6768319 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -61,7 +61,8 @@ namespace osu.Game.Overlays
             }
             set
             {
-                playlist.AllowBeatmapChange = value;
+                if(IsLoaded)
+                    playlist.AllowBeatmapChange = value;
             }
         }