diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index bd91ad9704..8f9acfd5be 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -223,15 +223,22 @@ namespace osu.Game.Tournament
 
             foreach (var r in ladder.Rounds)
             {
-                foreach (var b in r.Beatmaps)
+                foreach (var b in r.Beatmaps.ToList())
                 {
-                    if (b.BeatmapInfo == null && b.ID > 0)
+                    if (b.BeatmapInfo == null)
                     {
-                        var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
-                        API.Perform(req);
-                        b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
+                        if (b.ID > 0)
+                        {
+                            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
+                            API.Perform(req);
+                            b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
 
-                        addedInfo = true;
+                            addedInfo = true;
+                        }
+
+                        if (b.BeatmapInfo == null)
+                            // if online population couldn't be performed, ensure we don't leave a null value behind
+                            r.Beatmaps.Remove(b);
                     }
                 }
             }