diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 20ebfb3837..b7405074ff 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Select
 
                 computeYPositions();
 
-                if (selectedGroup.State == BeatmapGroupState.Hidden)
+                if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
                     SelectNext();
             };