diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
index 304fc271..332bf572 100644
--- a/assets/chat/js/chat.js
+++ b/assets/chat/js/chat.js
@@ -776,6 +776,10 @@ class Chat {
       win = this.mainwindow;
     }
 
+    if (win.containsMessage(message)) {
+      return;
+    }
+
     // Break the current combo if this message is not an emote
     // We don't need to check what type the current message is, we just know that its a new message, so the combo is invalid.
     if (
diff --git a/assets/chat/js/messages/ChatEventMessage.js b/assets/chat/js/messages/ChatEventMessage.js
index 27058189..9d0df8ba 100644
--- a/assets/chat/js/messages/ChatEventMessage.js
+++ b/assets/chat/js/messages/ChatEventMessage.js
@@ -9,6 +9,8 @@ export default class ChatEventMessage extends ChatMessage {
     this.isown = false;
     this.mentioned = [];
     this.uuid = uuid;
+
+    this.generateMessageHash();
   }
 
   html(chat = null) {