diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 1177d820c3..9e5446a573 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -181,12 +181,12 @@ namespace osu.Game.Screens.Select
             if (groups.Count == 0)
                 return;
 
-            randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
-
             var visibleGroups = getVisibleGroups();
             if (!visibleGroups.Any())
                 return;
 
+            randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
+
             BeatmapGroup group;
 
             if (randomType == SelectionRandomType.RandomPermutation)