diff --git a/osu.Game/Online/API/Requests/GetScoresRequest.cs b/osu.Game/Online/API/Requests/GetScoresRequest.cs
index ef9ee85d25..13bd8d288d 100644
--- a/osu.Game/Online/API/Requests/GetScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetScoresRequest.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
-using osu.Framework.IO.Network;
 using osu.Game.Beatmaps;
 using osu.Game.Users;
 using osu.Game.Rulesets.Replays;
@@ -19,6 +18,9 @@ namespace osu.Game.Online.API.Requests
 
         public GetScoresRequest(BeatmapInfo beatmap)
         {
+            if (!beatmap.OnlineBeatmapID.HasValue)
+                throw new InvalidOperationException($"Cannot lookup a beatmap's scores without having a populated {nameof(BeatmapInfo.OnlineBeatmapID)}.");
+
             this.beatmap = beatmap;
 
             Success += onSuccess;
@@ -30,14 +32,6 @@ namespace osu.Game.Online.API.Requests
                 score.ApplyBeatmap(beatmap);
         }
 
-        protected override WebRequest CreateWebRequest()
-        {
-            var req = base.CreateWebRequest();
-            //req.AddParameter(@"c", beatmap.Hash);
-            //req.AddParameter(@"f", beatmap.Path);
-            return req;
-        }
-
         protected override string Target => $@"beatmaps/{beatmap.OnlineBeatmapID}/scores";
     }
 
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 0506784614..7d65b8b648 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             Scores = null;
             getScoresRequest?.Cancel();
 
-            if (api == null || Beatmap == null) return;
+            if (api == null || Beatmap?.OnlineBeatmapID == null) return;
 
             loading.Show();