diff --git a/osu.Game.Tests/Online/TestSceneMetadataClient.cs b/osu.Game.Tests/Online/TestSceneMetadataClient.cs
new file mode 100644
index 0000000000..04e1d91edf
--- /dev/null
+++ b/osu.Game.Tests/Online/TestSceneMetadataClient.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Tests.Visual;
+using osu.Game.Tests.Visual.Metadata;
+
+namespace osu.Game.Tests.Online
+{
+    [TestFixture]
+    [HeadlessTest]
+    public partial class TestSceneMetadataClient : OsuTestScene
+    {
+        private TestMetadataClient client = null!;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Child = client = new TestMetadataClient();
+        });
+
+        [Test]
+        public void TestWatchingMultipleTimesInvokesServerMethodsOnce()
+        {
+            int countBegin = 0;
+            int countEnd = 0;
+
+            IDisposable token1 = null!;
+            IDisposable token2 = null!;
+
+            AddStep("setup", () =>
+            {
+                client.OnBeginWatchingUserPresence += () => countBegin++;
+                client.OnEndWatchingUserPresence += () => countEnd++;
+            });
+
+            AddStep("begin watching presence (1)", () => token1 = client.BeginWatchingUserPresence());
+            AddAssert("server method invoked once", () => countBegin, () => Is.EqualTo(1));
+
+            AddStep("begin watching presence (2)", () => token2 = client.BeginWatchingUserPresence());
+            AddAssert("server method not invoked a second time", () => countBegin, () => Is.EqualTo(1));
+
+            AddStep("end watching presence (1)", () => token1.Dispose());
+            AddAssert("server method not invoked", () => countEnd, () => Is.EqualTo(0));
+
+            AddStep("end watching presence (2)", () => token2.Dispose());
+            AddAssert("server method invoked once", () => countEnd, () => Is.EqualTo(1));
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
index b696c5d8ca..2e53ec2ba4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
@@ -65,7 +65,9 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestBasicDisplay()
         {
-            AddStep("Begin watching user presence", () => metadataClient.BeginWatchingUserPresence());
+            IDisposable token = null!;
+
+            AddStep("Begin watching user presence", () => token = metadataClient.BeginWatchingUserPresence());
             AddStep("Add online user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
             AddUntilStep("Panel loaded", () => currentlyOnline.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
             AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.False);
@@ -78,14 +80,16 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
             AddUntilStep("Panel no longer present", () => !currentlyOnline.ChildrenOfType<UserGridPanel>().Any());
-            AddStep("End watching user presence", () => metadataClient.EndWatchingUserPresence());
+            AddStep("End watching user presence", () => token.Dispose());
         }
 
         [Test]
         public void TestUserWasPlayingBeforeWatchingUserPresence()
         {
+            IDisposable token = null!;
+
             AddStep("User began playing", () => spectatorClient.SendStartPlay(streamingUser.Id, 0));
-            AddStep("Begin watching user presence", () => metadataClient.BeginWatchingUserPresence());
+            AddStep("Begin watching user presence", () => token = metadataClient.BeginWatchingUserPresence());
             AddStep("Add online user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
             AddUntilStep("Panel loaded", () => currentlyOnline.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
             AddAssert("Spectate button enabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.True);
@@ -93,7 +97,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("User finished playing", () => spectatorClient.SendEndPlay(streamingUser.Id));
             AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.False);
             AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
-            AddStep("End watching user presence", () => metadataClient.EndWatchingUserPresence());
+            AddStep("End watching user presence", () => token.Dispose());
         }
 
         internal partial class TestUserLookupCache : UserLookupCache
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index 4c2e47d336..f4fc15da20 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -4,17 +4,18 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Metadata;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Visual.Metadata;
 using osu.Game.Users;
 using osuTK;
 
@@ -23,144 +24,142 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public partial class TestSceneUserPanel : OsuTestScene
     {
-        private readonly Bindable<UserActivity?> activity = new Bindable<UserActivity?>();
-        private readonly Bindable<UserStatus?> status = new Bindable<UserStatus?>();
-
-        private UserGridPanel boundPanel1 = null!;
-        private TestUserListPanel boundPanel2 = null!;
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        [Cached(typeof(LocalUserStatisticsProvider))]
-        private readonly TestUserStatisticsProvider statisticsProvider = new TestUserStatisticsProvider();
-
         [Resolved]
         private IRulesetStore rulesetStore { get; set; } = null!;
 
+        private TestUserStatisticsProvider statisticsProvider = null!;
+        private TestMetadataClient metadataClient = null!;
+        private TestUserListPanel panel = null!;
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            activity.Value = null;
-            status.Value = null;
-
-            Remove(statisticsProvider, false);
-            Clear();
-            Add(statisticsProvider);
-
-            Add(new FillFlowContainer
+            Child = new DependencyProvidingContainer
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Spacing = new Vector2(10f),
+                RelativeSizeAxes = Axes.Both,
+                CachedDependencies =
+                [
+                    (typeof(LocalUserStatisticsProvider), statisticsProvider = new TestUserStatisticsProvider()),
+                    (typeof(MetadataClient), metadataClient = new TestMetadataClient())
+                ],
                 Children = new Drawable[]
                 {
-                    new UserBrickPanel(new APIUser
+                    statisticsProvider,
+                    metadataClient,
+                    new FillFlowContainer
                     {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
-                    }),
-                    new UserBrickPanel(new APIUser
-                    {
-                        Username = @"peppy",
-                        Id = 2,
-                        Colour = "99EB47",
-                        CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
-                    }),
-                    new UserGridPanel(new APIUser
-                    {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        CountryCode = CountryCode.JP,
-                        CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
-                        IsOnline = true
-                    }) { Width = 300 },
-                    boundPanel1 = new UserGridPanel(new APIUser
-                    {
-                        Username = @"peppy",
-                        Id = 2,
-                        CountryCode = CountryCode.AU,
-                        CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
-                        IsSupporter = true,
-                        SupportLevel = 3,
-                    }) { Width = 300 },
-                    boundPanel2 = new TestUserListPanel(new APIUser
-                    {
-                        Username = @"Evast",
-                        Id = 8195163,
-                        CountryCode = CountryCode.BY,
-                        CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
-                        IsOnline = false,
-                        LastVisit = DateTimeOffset.Now
-                    }),
-                    new UserRankPanel(new APIUser
-                    {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        CountryCode = CountryCode.JP,
-                        CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
-                        Statistics = new UserStatistics { GlobalRank = 12345, CountryRank = 1234 }
-                    }) { Width = 300 },
-                    new UserRankPanel(new APIUser
-                    {
-                        Username = @"peppy",
-                        Id = 2,
-                        Colour = "99EB47",
-                        CountryCode = CountryCode.AU,
-                        CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
-                        Statistics = new UserStatistics { GlobalRank = null, CountryRank = null }
-                    }) { Width = 300 }
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Spacing = new Vector2(10f),
+                        Children = new Drawable[]
+                        {
+                            new UserBrickPanel(new APIUser
+                            {
+                                Username = @"flyte",
+                                Id = 3103765,
+                                CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
+                            }),
+                            new UserBrickPanel(new APIUser
+                            {
+                                Username = @"peppy",
+                                Id = 2,
+                                Colour = "99EB47",
+                                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                            }),
+                            new UserGridPanel(new APIUser
+                            {
+                                Username = @"flyte",
+                                Id = 3103765,
+                                CountryCode = CountryCode.JP,
+                                CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
+                                IsOnline = true
+                            }) { Width = 300 },
+                            new UserGridPanel(new APIUser
+                            {
+                                Username = @"peppy",
+                                Id = 2,
+                                CountryCode = CountryCode.AU,
+                                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                                IsSupporter = true,
+                                SupportLevel = 3,
+                            }) { Width = 300 },
+                            panel = new TestUserListPanel(new APIUser
+                            {
+                                Username = @"peppy",
+                                Id = 2,
+                                CountryCode = CountryCode.AU,
+                                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                                LastVisit = DateTimeOffset.Now
+                            }),
+                            new UserRankPanel(new APIUser
+                            {
+                                Username = @"flyte",
+                                Id = 3103765,
+                                CountryCode = CountryCode.JP,
+                                CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
+                                Statistics = new UserStatistics { GlobalRank = 12345, CountryRank = 1234 }
+                            }) { Width = 300 },
+                            new UserRankPanel(new APIUser
+                            {
+                                Username = @"peppy",
+                                Id = 2,
+                                Colour = "99EB47",
+                                CountryCode = CountryCode.AU,
+                                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                                Statistics = new UserStatistics { GlobalRank = null, CountryRank = null }
+                            }) { Width = 300 },
+                            new UserGridPanel(API.LocalUser.Value)
+                            {
+                                Width = 300
+                            }
+                        }
+                    }
                 }
-            });
+            };
 
-            boundPanel1.Status.BindTo(status);
-            boundPanel1.Activity.BindTo(activity);
-
-            boundPanel2.Status.BindTo(status);
-            boundPanel2.Activity.BindTo(activity);
+            metadataClient.BeginWatchingUserPresence();
         });
 
         [Test]
         public void TestUserStatus()
         {
-            AddStep("online", () => status.Value = UserStatus.Online);
-            AddStep("do not disturb", () => status.Value = UserStatus.DoNotDisturb);
-            AddStep("offline", () => status.Value = UserStatus.Offline);
-            AddStep("null status", () => status.Value = null);
+            AddStep("online", () => setPresence(UserStatus.Online, null));
+            AddStep("do not disturb", () => setPresence(UserStatus.DoNotDisturb, null));
+            AddStep("offline", () => setPresence(UserStatus.Offline, null));
         }
 
         [Test]
         public void TestUserActivity()
         {
-            AddStep("set online status", () => status.Value = UserStatus.Online);
-
-            AddStep("idle", () => activity.Value = null);
-            AddStep("watching replay", () => activity.Value = new UserActivity.WatchingReplay(createScore(@"nats")));
-            AddStep("spectating user", () => activity.Value = new UserActivity.SpectatingUser(createScore(@"mrekk")));
-            AddStep("solo (osu!)", () => activity.Value = soloGameStatusForRuleset(0));
-            AddStep("solo (osu!taiko)", () => activity.Value = soloGameStatusForRuleset(1));
-            AddStep("solo (osu!catch)", () => activity.Value = soloGameStatusForRuleset(2));
-            AddStep("solo (osu!mania)", () => activity.Value = soloGameStatusForRuleset(3));
-            AddStep("choosing", () => activity.Value = new UserActivity.ChoosingBeatmap());
-            AddStep("editing beatmap", () => activity.Value = new UserActivity.EditingBeatmap(new BeatmapInfo()));
-            AddStep("modding beatmap", () => activity.Value = new UserActivity.ModdingBeatmap(new BeatmapInfo()));
-            AddStep("testing beatmap", () => activity.Value = new UserActivity.TestingBeatmap(new BeatmapInfo()));
+            AddStep("idle", () => setPresence(UserStatus.Online, null));
+            AddStep("watching replay", () => setPresence(UserStatus.Online, new UserActivity.WatchingReplay(createScore(@"nats"))));
+            AddStep("spectating user", () => setPresence(UserStatus.Online, new UserActivity.SpectatingUser(createScore(@"mrekk"))));
+            AddStep("solo (osu!)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(0)));
+            AddStep("solo (osu!taiko)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(1)));
+            AddStep("solo (osu!catch)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(2)));
+            AddStep("solo (osu!mania)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(3)));
+            AddStep("choosing", () => setPresence(UserStatus.Online, new UserActivity.ChoosingBeatmap()));
+            AddStep("editing beatmap", () => setPresence(UserStatus.Online, new UserActivity.EditingBeatmap(new BeatmapInfo())));
+            AddStep("modding beatmap", () => setPresence(UserStatus.Online, new UserActivity.ModdingBeatmap(new BeatmapInfo())));
+            AddStep("testing beatmap", () => setPresence(UserStatus.Online, new UserActivity.TestingBeatmap(new BeatmapInfo())));
         }
 
         [Test]
         public void TestUserActivityChange()
         {
-            AddAssert("visit message is visible", () => boundPanel2.LastVisitMessage.IsPresent);
-            AddStep("set online status", () => status.Value = UserStatus.Online);
-            AddAssert("visit message is not visible", () => !boundPanel2.LastVisitMessage.IsPresent);
-            AddStep("set choosing activity", () => activity.Value = new UserActivity.ChoosingBeatmap());
-            AddStep("set offline status", () => status.Value = UserStatus.Offline);
-            AddAssert("visit message is visible", () => boundPanel2.LastVisitMessage.IsPresent);
-            AddStep("set online status", () => status.Value = UserStatus.Online);
-            AddAssert("visit message is not visible", () => !boundPanel2.LastVisitMessage.IsPresent);
+            AddAssert("visit message is visible", () => panel.LastVisitMessage.IsPresent);
+            AddStep("set online status", () => setPresence(UserStatus.Online, null));
+            AddAssert("visit message is not visible", () => !panel.LastVisitMessage.IsPresent);
+            AddStep("set choosing activity", () => setPresence(UserStatus.Online, new UserActivity.ChoosingBeatmap()));
+            AddStep("set offline status", () => setPresence(UserStatus.Offline, null));
+            AddAssert("visit message is visible", () => panel.LastVisitMessage.IsPresent);
+            AddStep("set online status", () => setPresence(UserStatus.Online, null));
+            AddAssert("visit message is not visible", () => !panel.LastVisitMessage.IsPresent);
         }
 
         [Test]
@@ -185,6 +184,31 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set statistics to empty", () => statisticsProvider.UpdateStatistics(new UserStatistics(), Ruleset.Value));
         }
 
+        [Test]
+        public void TestLocalUserActivity()
+        {
+            AddStep("idle", () => setPresence(UserStatus.Online, null, API.LocalUser.Value.OnlineID));
+            AddStep("watching replay", () => setPresence(UserStatus.Online, new UserActivity.WatchingReplay(createScore(@"nats")), API.LocalUser.Value.OnlineID));
+            AddStep("spectating user", () => setPresence(UserStatus.Online, new UserActivity.SpectatingUser(createScore(@"mrekk")), API.LocalUser.Value.OnlineID));
+            AddStep("solo (osu!)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(0), API.LocalUser.Value.OnlineID));
+            AddStep("solo (osu!taiko)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(1), API.LocalUser.Value.OnlineID));
+            AddStep("solo (osu!catch)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(2), API.LocalUser.Value.OnlineID));
+            AddStep("solo (osu!mania)", () => setPresence(UserStatus.Online, soloGameStatusForRuleset(3), API.LocalUser.Value.OnlineID));
+            AddStep("choosing", () => setPresence(UserStatus.Online, new UserActivity.ChoosingBeatmap(), API.LocalUser.Value.OnlineID));
+            AddStep("editing beatmap", () => setPresence(UserStatus.Online, new UserActivity.EditingBeatmap(new BeatmapInfo()), API.LocalUser.Value.OnlineID));
+            AddStep("modding beatmap", () => setPresence(UserStatus.Online, new UserActivity.ModdingBeatmap(new BeatmapInfo()), API.LocalUser.Value.OnlineID));
+            AddStep("testing beatmap", () => setPresence(UserStatus.Online, new UserActivity.TestingBeatmap(new BeatmapInfo()), API.LocalUser.Value.OnlineID));
+            AddStep("set offline status", () => setPresence(UserStatus.Offline, null, API.LocalUser.Value.OnlineID));
+        }
+
+        private void setPresence(UserStatus status, UserActivity? activity, int? userId = null)
+        {
+            if (status == UserStatus.Offline)
+                metadataClient.UserPresenceUpdated(userId ?? panel.User.OnlineID, null);
+            else
+                metadataClient.UserPresenceUpdated(userId ?? panel.User.OnlineID, new UserPresence { Status = status, Activity = activity });
+        }
+
         private UserActivity soloGameStatusForRuleset(int rulesetId) => new UserActivity.InSoloGame(new BeatmapInfo(), rulesetStore.GetRuleset(rulesetId)!);
 
         private ScoreInfo createScore(string name) => new ScoreInfo(new TestBeatmap(Ruleset.Value).BeatmapInfo)
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index bdfb0217ad..d2069e4027 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -95,6 +95,9 @@ namespace osu.Game.Configuration
         /// </summary>
         DailyChallengeIntroPlayed,
 
+        /// <summary>
+        /// The activity for the current user to broadcast to other players.
+        /// </summary>
         UserOnlineActivity,
     }
 }
diff --git a/osu.Game/Online/Metadata/MetadataClient.cs b/osu.Game/Online/Metadata/MetadataClient.cs
index 3c0b47ad3d..9885419b65 100644
--- a/osu.Game/Online/Metadata/MetadataClient.cs
+++ b/osu.Game/Online/Metadata/MetadataClient.cs
@@ -3,9 +3,13 @@
 
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Online.Metadata
@@ -14,6 +18,9 @@ namespace osu.Game.Online.Metadata
     {
         public abstract IBindable<bool> IsConnected { get; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
         #region Beatmap metadata updates
 
         public abstract Task<BeatmapUpdates> GetChangesSince(int queueId);
@@ -32,11 +39,6 @@ namespace osu.Game.Online.Metadata
 
         #region User presence updates
 
-        /// <summary>
-        /// Whether the client is currently receiving user presence updates from the server.
-        /// </summary>
-        public abstract IBindable<bool> IsWatchingUserPresence { get; }
-
         /// <summary>
         /// The <see cref="UserPresence"/> information about the current user.
         /// </summary>
@@ -52,31 +54,91 @@ namespace osu.Game.Online.Metadata
         /// </summary>
         public abstract IBindableDictionary<int, UserPresence> FriendPresences { get; }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Attempts to retrieve the presence of a user.
+        /// </summary>
+        /// <param name="userId">The user ID.</param>
+        /// <returns>The user presence, or null if not available or the user's offline.</returns>
+        public UserPresence? GetPresence(int userId)
+        {
+            if (userId == api.LocalUser.Value.OnlineID)
+                return LocalUserPresence;
+
+            if (FriendPresences.TryGetValue(userId, out UserPresence presence))
+                return presence;
+
+            if (UserPresences.TryGetValue(userId, out presence))
+                return presence;
+
+            return null;
+        }
+
         public abstract Task UpdateActivity(UserActivity? activity);
 
-        /// <inheritdoc/>
         public abstract Task UpdateStatus(UserStatus? status);
 
-        /// <inheritdoc/>
-        public abstract Task BeginWatchingUserPresence();
+        private int userPresenceWatchCount;
 
-        /// <inheritdoc/>
-        public abstract Task EndWatchingUserPresence();
+        protected bool IsWatchingUserPresence
+            => Interlocked.CompareExchange(ref userPresenceWatchCount, userPresenceWatchCount, userPresenceWatchCount) > 0;
+
+        /// <summary>
+        /// Signals to the server that we want to begin receiving status updates for all users.
+        /// </summary>
+        /// <returns>An <see cref="IDisposable"/> which will end the session when disposed.</returns>
+        public IDisposable BeginWatchingUserPresence() => new UserPresenceWatchToken(this);
+
+        Task IMetadataServer.BeginWatchingUserPresence()
+        {
+            if (Interlocked.Increment(ref userPresenceWatchCount) == 1)
+                return BeginWatchingUserPresenceInternal();
+
+            return Task.CompletedTask;
+        }
+
+        Task IMetadataServer.EndWatchingUserPresence()
+        {
+            if (Interlocked.Decrement(ref userPresenceWatchCount) == 0)
+                return EndWatchingUserPresenceInternal();
+
+            return Task.CompletedTask;
+        }
+
+        protected abstract Task BeginWatchingUserPresenceInternal();
+
+        protected abstract Task EndWatchingUserPresenceInternal();
 
-        /// <inheritdoc/>
         public abstract Task UserPresenceUpdated(int userId, UserPresence? presence);
 
-        /// <inheritdoc/>
         public abstract Task FriendPresenceUpdated(int userId, UserPresence? presence);
 
+        private class UserPresenceWatchToken : IDisposable
+        {
+            private readonly IMetadataServer server;
+            private bool isDisposed;
+
+            public UserPresenceWatchToken(IMetadataServer server)
+            {
+                this.server = server;
+                server.BeginWatchingUserPresence().FireAndForget();
+            }
+
+            public void Dispose()
+            {
+                if (isDisposed)
+                    return;
+
+                server.EndWatchingUserPresence().FireAndForget();
+                isDisposed = true;
+            }
+        }
+
         #endregion
 
         #region Daily Challenge
 
         public abstract IBindable<DailyChallengeInfo?> DailyChallengeInfo { get; }
 
-        /// <inheritdoc/>
         public abstract Task DailyChallengeUpdated(DailyChallengeInfo? info);
 
         #endregion
diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 5aeeb04d11..c7c7dfc58b 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -20,9 +20,6 @@ namespace osu.Game.Online.Metadata
     {
         public override IBindable<bool> IsConnected { get; } = new Bindable<bool>();
 
-        public override IBindable<bool> IsWatchingUserPresence => isWatchingUserPresence;
-        private readonly BindableBool isWatchingUserPresence = new BindableBool();
-
         public override UserPresence LocalUserPresence => localUserPresence;
         private UserPresence localUserPresence;
 
@@ -109,15 +106,18 @@ namespace osu.Game.Online.Metadata
             {
                 Schedule(() =>
                 {
-                    isWatchingUserPresence.Value = false;
                     userPresences.Clear();
                     friendPresences.Clear();
                     dailyChallengeInfo.Value = null;
                     localUserPresence = default;
                 });
+
                 return;
             }
 
+            if (IsWatchingUserPresence)
+                BeginWatchingUserPresenceInternal();
+
             if (localUser.Value is not GuestUser)
             {
                 UpdateActivity(userActivity.Value);
@@ -201,6 +201,31 @@ namespace osu.Game.Online.Metadata
             return connection.InvokeAsync(nameof(IMetadataServer.UpdateStatus), status);
         }
 
+        protected override Task BeginWatchingUserPresenceInternal()
+        {
+            if (connector?.IsConnected.Value != true)
+                return Task.CompletedTask;
+
+            Logger.Log($@"{nameof(OnlineMetadataClient)} began watching user presence", LoggingTarget.Network);
+
+            Debug.Assert(connection != null);
+            return connection.InvokeAsync(nameof(IMetadataServer.BeginWatchingUserPresence));
+        }
+
+        protected override Task EndWatchingUserPresenceInternal()
+        {
+            if (connector?.IsConnected.Value != true)
+                return Task.CompletedTask;
+
+            Logger.Log($@"{nameof(OnlineMetadataClient)} stopped watching user presence", LoggingTarget.Network);
+
+            // must be scheduled before any remote calls to avoid mis-ordering.
+            Schedule(() => userPresences.Clear());
+
+            Debug.Assert(connection != null);
+            return connection.InvokeAsync(nameof(IMetadataServer.EndWatchingUserPresence));
+        }
+
         public override Task UserPresenceUpdated(int userId, UserPresence? presence)
         {
             Schedule(() =>
@@ -237,36 +262,6 @@ namespace osu.Game.Online.Metadata
             return Task.CompletedTask;
         }
 
-        public override async Task BeginWatchingUserPresence()
-        {
-            if (connector?.IsConnected.Value != true)
-                throw new OperationCanceledException();
-
-            Debug.Assert(connection != null);
-            await connection.InvokeAsync(nameof(IMetadataServer.BeginWatchingUserPresence)).ConfigureAwait(false);
-            Schedule(() => isWatchingUserPresence.Value = true);
-            Logger.Log($@"{nameof(OnlineMetadataClient)} began watching user presence", LoggingTarget.Network);
-        }
-
-        public override async Task EndWatchingUserPresence()
-        {
-            try
-            {
-                if (connector?.IsConnected.Value != true)
-                    throw new OperationCanceledException();
-
-                // must be scheduled before any remote calls to avoid mis-ordering.
-                Schedule(() => userPresences.Clear());
-                Debug.Assert(connection != null);
-                await connection.InvokeAsync(nameof(IMetadataServer.EndWatchingUserPresence)).ConfigureAwait(false);
-                Logger.Log($@"{nameof(OnlineMetadataClient)} stopped watching user presence", LoggingTarget.Network);
-            }
-            finally
-            {
-                Schedule(() => isWatchingUserPresence.Value = false);
-            }
-        }
-
         public override Task DailyChallengeUpdated(DailyChallengeInfo? info)
         {
             Schedule(() => dailyChallengeInfo.Value = info);
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
index bb4c9d96c8..2fb1ebc050 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
@@ -40,17 +38,20 @@ namespace osu.Game.Overlays.Dashboard
         private readonly IBindableDictionary<int, UserPresence> onlineUserPresences = new BindableDictionary<int, UserPresence>();
         private readonly Dictionary<int, OnlineUserPanel> userPanels = new Dictionary<int, OnlineUserPanel>();
 
-        private SearchContainer<OnlineUserPanel> userFlow;
-        private BasicSearchTextBox searchTextBox;
+        private SearchContainer<OnlineUserPanel> userFlow = null!;
+        private BasicSearchTextBox searchTextBox = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private SpectatorClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; } = null!;
 
         [Resolved]
-        private MetadataClient metadataClient { get; set; }
+        private MetadataClient metadataClient { get; set; } = null!;
+
+        [Resolved]
+        private UserLookupCache users { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -99,9 +100,6 @@ namespace osu.Game.Overlays.Dashboard
             searchTextBox.Current.ValueChanged += text => userFlow.SearchTerm = text.NewValue;
         }
 
-        [Resolved]
-        private UserLookupCache users { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -120,7 +118,7 @@ namespace osu.Game.Overlays.Dashboard
             searchTextBox.TakeFocus();
         }
 
-        private void onUserPresenceUpdated(object sender, NotifyDictionaryChangedEventArgs<int, UserPresence> e) => Schedule(() =>
+        private void onUserPresenceUpdated(object? sender, NotifyDictionaryChangedEventArgs<int, UserPresence> e) => Schedule(() =>
         {
             switch (e.Action)
             {
@@ -133,40 +131,13 @@ namespace osu.Game.Overlays.Dashboard
 
                         users.GetUserAsync(userId).ContinueWith(task =>
                         {
-                            APIUser user = task.GetResultSafely();
-
-                            if (user == null)
-                                return;
-
-                            Schedule(() =>
-                            {
-                                userFlow.Add(userPanels[userId] = createUserPanel(user).With(p =>
-                                {
-                                    var presence = onlineUserPresences.GetValueOrDefault(userId);
-
-                                    p.Status.Value = presence.Status;
-                                    p.Activity.Value = presence.Activity;
-                                }));
-                            });
+                            if (task.GetResultSafely() is APIUser user)
+                                Schedule(() => userFlow.Add(userPanels[userId] = createUserPanel(user)));
                         });
                     }
 
                     break;
 
-                case NotifyDictionaryChangedAction.Replace:
-                    Debug.Assert(e.NewItems != null);
-
-                    foreach (var kvp in e.NewItems)
-                    {
-                        if (userPanels.TryGetValue(kvp.Key, out var panel))
-                        {
-                            panel.Activity.Value = kvp.Value.Activity;
-                            panel.Status.Value = kvp.Value.Status;
-                        }
-                    }
-
-                    break;
-
                 case NotifyDictionaryChangedAction.Remove:
                     Debug.Assert(e.OldItems != null);
 
@@ -181,7 +152,7 @@ namespace osu.Game.Overlays.Dashboard
             }
         });
 
-        private void onPlayingUsersChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void onPlayingUsersChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             switch (e.Action)
             {
@@ -221,15 +192,12 @@ namespace osu.Game.Overlays.Dashboard
         {
             public readonly APIUser User;
 
-            public readonly Bindable<UserStatus?> Status = new Bindable<UserStatus?>();
-            public readonly Bindable<UserActivity> Activity = new Bindable<UserActivity>();
-
             public BindableBool CanSpectate { get; } = new BindableBool();
 
             public IEnumerable<LocalisableString> FilterTerms { get; }
 
-            [Resolved(canBeNull: true)]
-            private IPerformFromScreenRunner performer { get; set; }
+            [Resolved]
+            private IPerformFromScreenRunner? performer { get; set; }
 
             public bool FilteringActive { set; get; }
 
@@ -270,10 +238,7 @@ namespace osu.Game.Overlays.Dashboard
                             {
                                 RelativeSizeAxes = Axes.X,
                                 Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                // this is SHOCKING
-                                Activity = { BindTarget = Activity },
-                                Status = { BindTarget = Status },
+                                Origin = Anchor.TopCentre
                             },
                             new PurpleRoundedButton
                             {
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 1861f892bd..1912736135 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Metadata;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
 
@@ -18,6 +17,7 @@ namespace osu.Game.Overlays
         private MetadataClient metadataClient { get; set; } = null!;
 
         private IBindable<bool> metadataConnected = null!;
+        private IDisposable? userPresenceWatchToken;
 
         public DashboardOverlay()
             : base(OverlayColourScheme.Purple)
@@ -61,9 +61,12 @@ namespace osu.Game.Overlays
                 return;
 
             if (State.Value == Visibility.Visible)
-                metadataClient.BeginWatchingUserPresence().FireAndForget();
+                userPresenceWatchToken ??= metadataClient.BeginWatchingUserPresence();
             else
-                metadataClient.EndWatchingUserPresence().FireAndForget();
+            {
+                userPresenceWatchToken?.Dispose();
+                userPresenceWatchToken = null;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index ddc638b7c5..84b5889751 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Metadata;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -38,6 +39,9 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private SpectatorClient spectatorClient { get; set; } = null!;
 
+        [Resolved]
+        private MetadataClient metadataClient { get; set; } = null!;
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
@@ -50,6 +54,7 @@ namespace osu.Game.Screens.Spectate
         private readonly Dictionary<int, SpectatorGameplayState> gameplayStates = new Dictionary<int, SpectatorGameplayState>();
 
         private IDisposable? realmSubscription;
+        private IDisposable? userWatchToken;
 
         /// <summary>
         /// Creates a new <see cref="SpectatorScreen"/>.
@@ -64,6 +69,8 @@ namespace osu.Game.Screens.Spectate
         {
             base.LoadComplete();
 
+            userWatchToken = metadataClient.BeginWatchingUserPresence();
+
             userLookupCache.GetUsersAsync(users.ToArray()).ContinueWith(task => Schedule(() =>
             {
                 var foundUsers = task.GetResultSafely();
@@ -282,6 +289,7 @@ namespace osu.Game.Screens.Spectate
             }
 
             realmSubscription?.Dispose();
+            userWatchToken?.Dispose();
         }
     }
 }
diff --git a/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs b/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
index d14cbd7743..dca1b0e468 100644
--- a/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
+++ b/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
@@ -16,9 +16,6 @@ namespace osu.Game.Tests.Visual.Metadata
         public override IBindable<bool> IsConnected => isConnected;
         private readonly BindableBool isConnected = new BindableBool(true);
 
-        public override IBindable<bool> IsWatchingUserPresence => isWatchingUserPresence;
-        private readonly BindableBool isWatchingUserPresence = new BindableBool();
-
         public override UserPresence LocalUserPresence => localUserPresence;
         private UserPresence localUserPresence;
 
@@ -34,15 +31,18 @@ namespace osu.Game.Tests.Visual.Metadata
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        public override Task BeginWatchingUserPresence()
+        public event Action? OnBeginWatchingUserPresence;
+        public event Action? OnEndWatchingUserPresence;
+
+        protected override Task BeginWatchingUserPresenceInternal()
         {
-            isWatchingUserPresence.Value = true;
+            OnBeginWatchingUserPresence?.Invoke();
             return Task.CompletedTask;
         }
 
-        public override Task EndWatchingUserPresence()
+        protected override Task EndWatchingUserPresenceInternal()
         {
-            isWatchingUserPresence.Value = false;
+            OnEndWatchingUserPresence?.Invoke();
             return Task.CompletedTask;
         }
 
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Metadata
         {
             localUserPresence = localUserPresence with { Activity = activity };
 
-            if (isWatchingUserPresence.Value)
+            if (IsWatchingUserPresence)
             {
                 if (userPresences.ContainsKey(api.LocalUser.Value.Id))
                     userPresences[api.LocalUser.Value.Id] = localUserPresence;
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Metadata
         {
             localUserPresence = localUserPresence with { Status = status };
 
-            if (isWatchingUserPresence.Value)
+            if (IsWatchingUserPresence)
             {
                 if (userPresences.ContainsKey(api.LocalUser.Value.Id))
                     userPresences[api.LocalUser.Value.Id] = localUserPresence;
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Visual.Metadata
 
         public override Task UserPresenceUpdated(int userId, UserPresence? presence)
         {
-            if (isWatchingUserPresence.Value)
+            if (IsWatchingUserPresence)
             {
                 if (presence?.Status != null)
                 {
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index e33fb7a44e..b6fa4bbac6 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -1,10 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,43 +13,51 @@ using osu.Game.Users.Drawables;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Metadata;
 
 namespace osu.Game.Users
 {
     public abstract partial class ExtendedUserPanel : UserPanel
     {
-        public readonly Bindable<UserStatus?> Status = new Bindable<UserStatus?>();
+        protected TextFlowContainer LastVisitMessage { get; private set; } = null!;
 
-        public readonly IBindable<UserActivity> Activity = new Bindable<UserActivity>();
+        private StatusIcon statusIcon = null!;
+        private StatusText statusMessage = null!;
 
-        protected TextFlowContainer LastVisitMessage { get; private set; }
+        [Resolved]
+        private MetadataClient? metadata { get; set; }
 
-        private StatusIcon statusIcon;
-        private StatusText statusMessage;
+        private UserStatus? lastStatus;
+        private UserActivity? lastActivity;
+        private DateTimeOffset? lastVisit;
 
         protected ExtendedUserPanel(APIUser user)
             : base(user)
         {
+            lastVisit = user.LastVisit;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             BorderColour = ColourProvider?.Light1 ?? Colours.GreyVioletLighter;
-
-            Status.ValueChanged += status => displayStatus(status.NewValue, Activity.Value);
-            Activity.ValueChanged += activity => displayStatus(Status.Value, activity.NewValue);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Status.TriggerChange();
+            updatePresence();
 
             // Colour should be applied immediately on first load.
             statusIcon.FinishTransforms();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            updatePresence();
+        }
+
         protected Container CreateStatusIcon() => statusIcon = new StatusIcon();
 
         protected FillFlowContainer CreateStatusMessage(bool rightAlignedChildren)
@@ -70,15 +76,6 @@ namespace osu.Game.Users
                 text.Origin = alignment;
                 text.AutoSizeAxes = Axes.Both;
                 text.Alpha = 0;
-
-                if (User.LastVisit.HasValue)
-                {
-                    text.AddText(@"Last seen ");
-                    text.AddText(new DrawableDate(User.LastVisit.Value, italic: false)
-                    {
-                        Shadow = false
-                    });
-                }
             }));
 
             statusContainer.Add(statusMessage = new StatusText
@@ -91,37 +88,47 @@ namespace osu.Game.Users
             return statusContainer;
         }
 
-        private void displayStatus(UserStatus? status, UserActivity activity = null)
+        private void updatePresence()
         {
-            if (status != null)
+            UserPresence? presence = metadata?.GetPresence(User.OnlineID);
+            UserStatus status = presence?.Status ?? UserStatus.Offline;
+            UserActivity? activity = presence?.Activity;
+
+            if (status == lastStatus && activity == lastActivity)
+                return;
+
+            if (status == UserStatus.Offline && lastVisit != null)
             {
-                LastVisitMessage.FadeTo(status == UserStatus.Offline && User.LastVisit.HasValue ? 1 : 0);
-
-                // Set status message based on activity (if we have one) and status is not offline
-                if (activity != null && status != UserStatus.Offline)
+                LastVisitMessage.FadeTo(1);
+                LastVisitMessage.Clear();
+                LastVisitMessage.AddText(@"Last seen ");
+                LastVisitMessage.AddText(new DrawableDate(lastVisit.Value, italic: false)
                 {
-                    statusMessage.Text = activity.GetStatus();
-                    statusMessage.TooltipText = activity.GetDetails();
-                    statusIcon.FadeColour(activity.GetAppropriateColour(Colours), 500, Easing.OutQuint);
-                    return;
-                }
+                    Shadow = false
+                });
+            }
+            else
+                LastVisitMessage.FadeTo(0);
 
-                // Otherwise use only status
+            // Set status message based on activity (if we have one) and status is not offline
+            if (activity != null && status != UserStatus.Offline)
+            {
+                statusMessage.Text = activity.GetStatus();
+                statusMessage.TooltipText = activity.GetDetails() ?? string.Empty;
+                statusIcon.FadeColour(activity.GetAppropriateColour(Colours), 500, Easing.OutQuint);
+            }
+
+            // Otherwise use only status
+            else
+            {
                 statusMessage.Text = status.GetLocalisableDescription();
                 statusMessage.TooltipText = string.Empty;
-                statusIcon.FadeColour(status.Value.GetAppropriateColour(Colours), 500, Easing.OutQuint);
-
-                return;
+                statusIcon.FadeColour(status.GetAppropriateColour(Colours), 500, Easing.OutQuint);
             }
 
-            // Fallback to web status if local one is null
-            if (User.IsOnline)
-            {
-                Status.Value = UserStatus.Online;
-                return;
-            }
-
-            Status.Value = UserStatus.Offline;
+            lastStatus = status;
+            lastActivity = activity;
+            lastVisit = status != UserStatus.Offline ? DateTimeOffset.Now : lastVisit;
         }
 
         protected override bool OnHover(HoverEvent e)