diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 25c8205c30..aff0540652 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -141,17 +141,14 @@ namespace osu.Game.Screens.Ranking
         {
             base.LoadComplete();
 
-            if (Score.Beatmap.OnlineBeatmapID != null && Score.Beatmap.Status > BeatmapSetOnlineStatus.Pending)
+            var req = FetchScores(scores => Schedule(() =>
             {
-                var req = FetchScores(scores => Schedule(() =>
-                {
-                    foreach (var s in scores)
-                        panels.AddScore(s);
-                }));
+                foreach (var s in scores)
+                    panels.AddScore(s);
+            }));
 
-                if (req != null)
-                    api.Queue(req);
-            }
+            if (req != null)
+                api.Queue(req);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 3ae723683a..9cf2e6757a 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
@@ -24,6 +25,9 @@ namespace osu.Game.Screens.Ranking
 
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
+            if (Score.Beatmap.OnlineBeatmapID == null || Score.Beatmap.Status <= BeatmapSetOnlineStatus.Pending)
+                return null;
+
             var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
             req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
             return req;