diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index ca61672ef9..c0a021436e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -52,19 +52,19 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("add player 2", () => createLeaderboardScore(player2Score, new User { Username = "Player 2" }));
             AddStep("add player 3", () => createLeaderboardScore(player3Score, new User { Username = "Player 3" }));
 
-            AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
-            AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
-            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+            AddUntilStep("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
+            AddUntilStep("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
+            AddUntilStep("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
 
             AddStep("set score above player 3", () => player2Score.Value = playerScore.Value - 500);
-            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
-            AddAssert("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
-            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+            AddUntilStep("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddUntilStep("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
+            AddUntilStep("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
 
             AddStep("set score below players", () => player2Score.Value = playerScore.Value - 123456);
-            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
-            AddAssert("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
-            AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
+            AddUntilStep("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddUntilStep("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
+            AddUntilStep("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index cab1cbd3f1..e33cc05e64 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Users;
@@ -12,6 +13,8 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
     {
+        private readonly Cached sorting = new Cached();
+
         public GameplayLeaderboard()
         {
             Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
@@ -24,6 +27,13 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(sort, 1000, true);
+        }
+
         /// <summary>
         /// Adds a player to the leaderboard.
         /// </summary>
@@ -41,7 +51,7 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             base.Add(drawable);
-            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+            drawable.TotalScore.BindValueChanged(_ => sorting.Invalidate(), true);
 
             Height = Count * (GameplayLeaderboardScore.PANEL_HEIGHT + Spacing.Y);
 
@@ -55,6 +65,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void sort()
         {
+            if (sorting.IsValid)
+                return;
+
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
             for (int i = 0; i < Count; i++)
@@ -62,6 +75,8 @@ namespace osu.Game.Screens.Play.HUD
                 SetLayoutPosition(orderedByScore[i], i);
                 orderedByScore[i].ScorePosition = i + 1;
             }
+
+            sorting.Validate();
         }
     }
 }