diff --git a/osu.Game/Screens/Select/PanelLocalRankDisplay.cs b/osu.Game/Screens/Select/PanelLocalRankDisplay.cs
index 8886bad420..1d93ff3ab6 100644
--- a/osu.Game/Screens/Select/PanelLocalRankDisplay.cs
+++ b/osu.Game/Screens/Select/PanelLocalRankDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
@@ -27,6 +28,9 @@ namespace osu.Game.Screens.Select
             get => beatmap;
             set
             {
+                if (beatmap?.Equals(value) == true)
+                    return;
+
                 beatmap = value;
 
                 if (IsLoaded)
@@ -40,8 +44,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
+        private readonly IBindable<APIUser> localUser = new Bindable<APIUser>();
 
         private IDisposable? scoreSubscription;
 
@@ -62,11 +65,18 @@ namespace osu.Game.Screens.Select
             Beatmap = beatmap;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            localUser.BindTo(api.LocalUser);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            ruleset.BindValueChanged(_ => updateSubscription(), true);
+            ruleset.BindValueChanged(_ => updateSubscription());
+            localUser.BindValueChanged(_ => updateSubscription(), true);
         }
 
         private void updateSubscription()
@@ -89,7 +99,7 @@ namespace osu.Game.Screens.Select
 
             ScoreInfo? topScore = sender
                                   // doing these post realm filter is most efficient.
-                                  .Where(s => s.UserID == api.LocalUser.Value.Id || s.UserID <= 1)
+                                  .Where(s => s.UserID == localUser.Value.Id || s.UserID <= 1)
                                   .Where(s => ruleset.Value.Equals(s.Ruleset))
                                   .MaxBy(info => (info.TotalScore, -info.Date.UtcDateTime.Ticks));