diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index a0ccb5a393..91c3dfad65 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -261,6 +261,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 var scoreInfos = newScores.Scores.Select(s => s.CreateScoreInfo(rulesets))
                                           .OrderByDescending(s => scoreManager.GetTotalScore(s))
+                                          .ThenBy(s => s.OnlineScoreID)
                                           .ToList();
 
                 var topScore = scoreInfos.First();
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 04e7172519..0276ae8b2a 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -146,7 +146,10 @@ namespace osu.Game.Screens.Select.Leaderboards
                     scores = scores.Where(s => s.Mods.Any(m => selectedMods.Contains(m.Acronym)));
                 }
 
-                Scores = scores.OrderByDescending(s => scoreManager.GetTotalScore(s)).ToArray();
+                Scores = scores.OrderByDescending(s => scoreManager.GetTotalScore(s))
+                               .ThenBy(s => s.OnlineScoreID)
+                               .ToArray();
+
                 PlaceholderState = Scores.Any() ? PlaceholderState.Successful : PlaceholderState.NoScores;
 
                 return null;
@@ -182,7 +185,11 @@ namespace osu.Game.Screens.Select.Leaderboards
 
             req.Success += r =>
             {
-                scoresCallback?.Invoke(r.Scores.Select(s => s.CreateScoreInfo(rulesets)).OrderByDescending(s => scoreManager.GetTotalScore(s)));
+                scoresCallback?.Invoke(
+                    r.Scores.Select(s => s.CreateScoreInfo(rulesets))
+                     .OrderByDescending(s => scoreManager.GetTotalScore(s))
+                     .ThenBy(s => s.OnlineScoreID));
+
                 TopScore = r.UserScore?.CreateScoreInfo(rulesets);
             };