diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
index d6f40c3a..6fb064b1 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
@@ -460,6 +460,8 @@ class ChannelScreenViewModel @Inject constructor(
                     when (it) {
                         is MessageFrame -> {
                             if (it.channel != channel?.id) return@onEach
+                            // If we already have the message we are just catching up on the WebSocket connection. Skip
+                            if (items.any { m -> (m is ChannelScreenItem.RegularMessage && m.message.id == it.id) || (m is ChannelScreenItem.SystemMessage && m.message.id == it.id) }) return@onEach
 
                             it.author?.let { userId ->
                                 if (RevoltAPI.userCache[userId] == null) {