diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 6538bcfcf4..4d228b2af0 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -71,6 +71,25 @@ namespace osu.Game.Overlays.Chat
         private Drawable? background;
 
         private bool alternatingBackground;
+        private bool requiresTimestamp = true;
+
+
+        public bool RequiresTimestamp
+        {
+            get => requiresTimestamp;
+            set
+            {
+                if (requiresTimestamp == value)
+                    return;
+
+                requiresTimestamp = value;
+
+                if (!IsLoaded)
+                    return;
+
+                updateMessageContent();
+            }
+        }
 
         public bool AlternatingBackground
         {
@@ -244,9 +263,17 @@ namespace osu.Game.Overlays.Chat
         private void updateMessageContent()
         {
             this.FadeTo(message is LocalEchoMessage ? 0.4f : 1.0f, 500, Easing.OutQuint);
-            drawableTimestamp.FadeTo(message is LocalEchoMessage ? 0 : 1, 500, Easing.OutQuint);
 
-            updateTimestamp();
+            if (requiresTimestamp && !(message is LocalEchoMessage))
+            {
+                drawableTimestamp.Show();
+                updateTimestamp();
+            }
+            else
+            {
+                drawableTimestamp.Hide();
+            }
+
             drawableUsername.Text = $@"{message.Sender.Username}";
 
             // remove non-existent channels from the link list
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 6b3acaa226..05d09401a9 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -88,10 +88,16 @@ namespace osu.Game.Overlays.Chat
         {
             base.Update();
 
+            int? minute = null;
+
             for (int i = 0; i < ChatLineFlow.Count; i++)
             {
                 if (ChatLineFlow[i] is ChatLine chatline)
+                {
                     chatline.AlternatingBackground = i % 2 == 0;
+                    chatline.RequiresTimestamp = chatline.Message.Timestamp.Minute != minute;
+                    minute = chatline.Message.Timestamp.Minute;
+                }
             }
         }