diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js
index 7e6cf50..650b048 100644
--- a/luckydiamond/src/assets/js/chat/ChatLogic.js
+++ b/luckydiamond/src/assets/js/chat/ChatLogic.js
@@ -16,7 +16,11 @@ export function ConnectToChat() {
 
         webSocket.onmessage = function (event) {
 
-            eventBus.emit('dataChat', event.data)
+            const dataObject = JSON.parse(event.data);
+
+            if (dataObject && dataObject.hasOwnProperty('SpUserName') && dataObject.hasOwnProperty('Message')) {
+                eventBus.emit('dataChat', dataObject);
+            }
 
             console.log('Message from Server:', event.data);
         };