diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js
index 438b7ad..b5c071b 100644
--- a/frontend/src/components/MessagesList/index.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -452,14 +452,14 @@ const MessagesList = ({ ticketId, isGroup }) => {
 
     onAppMessageMessagesList = (data) => {
 
-      if (data.action === "create") {
+      if (data.action === "create" && data.ticket.id === ticketId) {
 
         dispatch({ type: "ADD_MESSAGE", payload: data.message })
 
         scrollToBottom()
       }
 
-      if (data.action === "update") {
+      if (data.action === "update" && data.ticket.id === ticketId) {
         dispatch({ type: "UPDATE_MESSAGE", payload: data.message })
       }
     }