diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b4494936f4..9e5a2fa633 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -444,7 +444,7 @@ namespace osu.Game.Screens.Select
         {
             if (!Beatmap.IsDefault && Beatmap.Value.BeatmapSetInfo?.DeletePending == false)
                 Carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo);
-            else
+            else if (Carousel.SelectedBeatmapSet == null)
                 Carousel.SelectNextRandom();
         }