diff --git a/osu.Game.Tests/Visual/TestCaseChatLink.cs b/osu.Game.Tests/Visual/TestCaseChatLink.cs
index bed404bfc0..1b6556e836 100644
--- a/osu.Game.Tests/Visual/TestCaseChatLink.cs
+++ b/osu.Game.Tests/Visual/TestCaseChatLink.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Tests.Visual
 
         private class DummyMessage : Message
         {
-            private static long messageCounter = 0;
-            private static User sender = new User
+            private static long messageCounter;
+            private readonly static User sender = new User
             {
                 Username = @"Somebody",
                 Id = 1,
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index db7c255eb4..963fee5aa9 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -256,7 +256,6 @@ namespace osu.Game.Overlays.Chat
                     });
                 }
 
-                // Add text after the last link
                 var lastLink = message.Links[message.Links.Count - 1];
                 contentFlow.AddText(message.Content.Substring(lastLink.Index + lastLink.Length));
             }