diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
index 709e75ab13..c70cc4ae4e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
@@ -69,28 +69,22 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddStep("null user", () => graph.User.Value = null);
+            AddStep("null user", () => graph.Statistics.Value = null);
             AddStep("rank only", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
-                    {
-                        Ranks = new UserStatistics.UserRanks { Global = 123456 },
-                        PP = 12345,
-                    }
+                    Ranks = new UserStatistics.UserRanks { Global = 123456 },
+                    PP = 12345,
                 };
             });
 
             AddStep("with rank history", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
-                    {
-                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
-                        PP = 12345,
-                    },
+                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
+                    PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
                         Data = data,
@@ -100,13 +94,10 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("with zero values", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
-                    {
-                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
-                        PP = 12345,
-                    },
+                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
+                    PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
                         Data = dataWithZeros,
@@ -116,13 +107,10 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("small amount of data", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
-                    {
-                        Ranks = new UserStatistics.UserRanks { Global = 12000 },
-                        PP = 12345,
-                    },
+                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
+                    PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
                         Data = smallData,
@@ -132,13 +120,10 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("graph with edges", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
-                    {
-                        Ranks = new UserStatistics.UserRanks { Global = 12000 },
-                        PP = 12345,
-                    },
+                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
+                    PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
                         Data = edgyData,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index c2376aa153..84c99d8c3a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -50,12 +50,12 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Current = 727,
                     Progress = 69,
-                }
-            },
-            RankHistory = new User.RankHistoryData
-            {
-                Mode = @"osu",
-                Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
+                },
+                RankHistory = new User.RankHistoryData
+                {
+                    Mode = @"osu",
+                    Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
+                },
             },
             Badges = new[]
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 5f79386b76..4818cd8df6 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         private KeyValuePair<int, int>[] ranks;
         private int dayIndex;
-        public Bindable<User> User = new Bindable<User>();
+        public readonly Bindable<UserStatistics> Statistics = new Bindable<UserStatistics>();
 
         public RankGraph()
         {
@@ -56,8 +56,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
             };
 
             graph.OnBallMove += i => dayIndex = i;
-
-            User.ValueChanged += userChanged;
         }
 
         [BackgroundDependencyLoader]
@@ -66,18 +64,25 @@ namespace osu.Game.Overlays.Profile.Header.Components
             graph.LineColour = colours.Yellow;
         }
 
-        private void userChanged(ValueChangedEvent<User> e)
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Statistics.BindValueChanged(statistics => updateStatistics(statistics.NewValue));
+        }
+
+        private void updateStatistics(UserStatistics statistics)
         {
             placeholder.FadeIn(fade_duration, Easing.Out);
 
-            if (e.NewValue?.Statistics?.Ranks.Global == null)
+            if (statistics?.Ranks.Global == null)
             {
                 graph.FadeOut(fade_duration, Easing.Out);
                 ranks = null;
                 return;
             }
 
-            int[] userRanks = e.NewValue.RankHistory?.Data ?? new[] { e.NewValue.Statistics.Ranks.Global.Value };
+            int[] userRanks = statistics.RankHistory?.Data ?? new[] { statistics.Ranks.Global.Value };
             ranks = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
 
             if (ranks.Length > 1)
@@ -191,7 +196,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
         }
 
-        public string TooltipText => User.Value?.Statistics?.Ranks.Global == null ? "" : $"#{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}";
+        public string TooltipText => Statistics.Value?.Ranks.Global == null ? "" : $"#{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}";
 
         public ITooltip GetCustomTooltip() => new RankGraphTooltip();
 
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 0db1cb32d7..6ee0d9ee8f 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Overlays.Profile.Header
             detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-";
             detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
 
-            rankGraph.User.Value = user;
+            rankGraph.Statistics.Value = user?.Statistics;
         }
 
         private class ScoreRankInfo : CompositeDrawable
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 34bd4bbaae..b738eff4a6 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -159,7 +159,10 @@ namespace osu.Game.Users
         }
 
         [JsonProperty(@"rankHistory")]
-        public RankHistoryData RankHistory;
+        private RankHistoryData rankHistory
+        {
+            set => Statistics.RankHistory = value;
+        }
 
         [JsonProperty("badges")]
         public Badge[] Badges;
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 7afbef01c5..032ec2e05f 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -4,6 +4,7 @@
 using System;
 using Newtonsoft.Json;
 using osu.Game.Scoring;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Users
 {
@@ -113,5 +114,7 @@ namespace osu.Game.Users
             [JsonProperty(@"country")]
             public int? Country;
         }
+
+        public RankHistoryData RankHistory;
     }
 }