diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 48908fb9a0..10049c7718 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -174,6 +174,10 @@ namespace osu.Game.Screens.Play.HUD
                 orderedByScore[i].ScorePosition = i + 1;
             }
 
+            // change displayed potision to '#?' when there are 50 already submitted scores and tracked score is last
+            if (TrackedScore?.ScorePosition == Flow.Count && Flow.Count == 51)
+                TrackedScore.ScorePosition = null;
+
             sorting.Validate();
         }
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 2eec8253b3..dc2c0620c8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -72,10 +72,8 @@ namespace osu.Game.Screens.Play.HUD
 
                 scorePosition = value;
 
-                if (scorePosition.HasValue)
-                    positionText.Text = $"#{scorePosition.Value.FormatRank()}";
+                positionText.Text = scorePosition.HasValue ? $"#{scorePosition.Value.FormatRank()}" : "#?";
 
-                positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
                 updateState();
             }
         }