From 6a18d18feb0ada227cb85fdb9144439196b3cef7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 2 Feb 2025 13:28:31 +0900
Subject: [PATCH] Fix null handling when no items are populated but a selection
 is made

---
 osu.Game/Screens/SelectV2/BeatmapCarousel.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
index 10bc069cfc..858888c517 100644
--- a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
@@ -124,9 +124,10 @@ namespace osu.Game.Screens.SelectV2
                     if (Criteria.SplitOutDifficulties)
                     {
                         // Find the containing group. There should never be too many groups so iterating is efficient enough.
-                        GroupDefinition group = grouping.GroupItems.Single(kvp => kvp.Value.Any(i => ReferenceEquals(i.Model, beatmapInfo))).Key;
+                        GroupDefinition? group = grouping.GroupItems.SingleOrDefault(kvp => kvp.Value.Any(i => ReferenceEquals(i.Model, beatmapInfo))).Key;
 
-                        setVisibleGroup(group);
+                        if (group != null)
+                            setVisibleGroup(group);
                     }
                     else
                     {