diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index e9a518b2fd..f91339e060 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -114,7 +114,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestPlaceholderStates()
         {
-            AddStep(@"Empty Scores", () => leaderboard.SetErrorState(LeaderboardErrorState.NoScores));
+            AddStep("ensure no scores displayed", () => leaderboard.SetScores(null));
+
             AddStep(@"Network failure", () => leaderboard.SetErrorState(LeaderboardErrorState.NetworkFailure));
             AddStep(@"No supporter", () => leaderboard.SetErrorState(LeaderboardErrorState.NotSupporter));
             AddStep(@"Not logged in", () => leaderboard.SetErrorState(LeaderboardErrorState.NotLoggedIn));
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 9c46739443..9fb0fe0e3b 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -165,6 +165,7 @@ namespace osu.Game.Online.Leaderboards
         {
             switch (errorState)
             {
+                case LeaderboardErrorState.NoScores:
                 case LeaderboardErrorState.NoError:
                     throw new InvalidOperationException($"State {errorState} cannot be set by a leaderboard implementation.");
             }
@@ -250,7 +251,7 @@ namespace osu.Game.Online.Leaderboards
 
             if (scores?.Any() != true)
             {
-                SetErrorState(LeaderboardErrorState.NoScores);
+                setErrorState(LeaderboardErrorState.NoScores);
                 loading.Hide();
                 return;
             }