diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index faf48ef854..e9e2cc63c2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -616,7 +616,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Show report popover", () => this.ChildrenOfType<DrawableUsername>().First().ShowPopover());
+            AddStep("Show report popover", () => this.ChildrenOfType<DrawableChatUsername>().First().ShowPopover());
 
             AddStep("Set report reason to other", () =>
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 0e69501ae9..dca34128d1 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Chat
 
         private readonly OsuSpriteText drawableTimestamp;
 
-        private readonly DrawableUsername drawableUsername;
+        private readonly DrawableChatUsername drawableUsername;
 
         private readonly LinkFlowContainer drawableContentFlow;
 
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername = new DrawableUsername(message)
+                        drawableUsername = new DrawableChatUsername(message.Sender, message.Id)
                         {
                             Width = UsernameWidth,
                             FontSize = FontSize,
diff --git a/osu.Game/Overlays/Chat/DrawableUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
similarity index 96%
rename from osu.Game/Overlays/Chat/DrawableUsername.cs
rename to osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 25967003e9..4ba5c9769a 100644
--- a/osu.Game/Overlays/Chat/DrawableUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -31,7 +31,7 @@ using ChatStrings = osu.Game.Localisation.ChatStrings;
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
+    public partial class DrawableChatUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
     {
         public Color4 AccentColour { get; }
 
@@ -73,15 +73,15 @@ namespace osu.Game.Overlays.Chat
         private Bindable<Channel?>? currentChannel { get; set; }
 
         private readonly APIUser user;
-        private readonly Message message;
+        private readonly long? messageId;
         private readonly OsuSpriteText drawableText;
 
         private readonly Drawable colouredDrawable;
 
-        public DrawableUsername(Message message)
+        public DrawableChatUsername(APIUser user, long? messageId)
         {
-            this.message = message;
-            user = message.Sender;
+            this.user = user;
+            this.messageId = messageId;
 
             Action = openUserProfile;
 
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Chat
 
         private void report(ChatReportReason reason, string comments)
         {
-            var request = new ChatReportRequest(message.Id, reason, comments);
+            var request = new ChatReportRequest(messageId, reason, comments);
 
             request.Failure += _ => Schedule(() =>
             {