diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index d5e8b209f0..d6a1b23c46 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -309,10 +309,10 @@ private void currentChannelChanged(ValueChangedEvent<Channel> e)
         /// <param name="message">The message to highlight.</param>
         public void HighlightMessage(Message message)
         {
-            if (currentChannel.Value.Id != message.ChannelId)
-                currentChannel.Value = channelManager.JoinedChannels.Single(c => c.Id == message.ChannelId);
+            if (channelManager.CurrentChannel.Value.Id != message.ChannelId)
+                channelManager.CurrentChannel.Value = channelManager.JoinedChannels.Single(c => c.Id == message.ChannelId);
 
-            currentChannel.Value.HighlightedMessage.Value = message;
+            channelManager.CurrentChannel.Value.HighlightedMessage.Value = message;
         }
 
         private float startDragChatHeight;