diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index c7bdf8feee..e8d6f18fd7 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -180,12 +180,17 @@ namespace osu.Game.Tournament.Screens.MapPool
 
         private void matchChanged(MatchPairing match)
         {
-            foreach (var b in match.Grouping.Value.Beatmaps)
-                maps.Add(new TournamentBeatmapPanel(b.BeatmapInfo)
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                });
+            maps.Clear();
+
+            if (match.Grouping.Value != null)
+            {
+                foreach (var b in match.Grouping.Value.Beatmaps)
+                    maps.Add(new TournamentBeatmapPanel(b.BeatmapInfo)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    });
+            }
         }
     }
 }