diff --git a/snikket/Chat.hx b/snikket/Chat.hx
index a5fb50c..f5a2b5a 100644
--- a/snikket/Chat.hx
+++ b/snikket/Chat.hx
@@ -1058,7 +1058,7 @@ class Channel extends Chat {
 							serverIds[m.serverId] = true;
 						}
 					}
-					final readIndex = dedupedMessages.findIndex((m) -> m.serverId == readUpTo());
+					final readIndex = dedupedMessages.findIndex((m) -> m.serverId == readUpTo() || !m.isIncoming());
 					if (readIndex < 0) {
 						setUnreadCount(unreadCount() + dedupedMessages.length);
 					} else {