diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18f26012..ef120a3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Moving a discussion over a user will now add this user to the discussion
 - Being in a silent zone new forces mediaConstraints to false (#1508)
 - Fixes for the emote menu (#1501)
+- Fixing chat message attributed to wrong user (#1507 #1528)
 
 ## Version 1.5.0
 ### Updates
diff --git a/front/src/Stores/ChatStore.ts b/front/src/Stores/ChatStore.ts
index feb1f3ec..1bb763cf 100644
--- a/front/src/Stores/ChatStore.ts
+++ b/front/src/Stores/ChatStore.ts
@@ -84,7 +84,7 @@ function createChatMessagesStore() {
         addExternalMessage(authorId: number, text: string) {
             update((list) => {
                 const lastMessage = list[list.length - 1];
-                if (lastMessage && lastMessage.type === ChatMessageTypes.text && lastMessage.text) {
+                if (lastMessage && lastMessage.type === ChatMessageTypes.text && lastMessage.text && lastMessage?.author?.userId === authorId) {
                     lastMessage.text.push(text);
                 } else {
                     list.push({
diff --git a/maps/tests/script.js b/maps/tests/script.js
index 52b201d6..f92deb84 100644
--- a/maps/tests/script.js
+++ b/maps/tests/script.js
@@ -40,6 +40,7 @@ WA.chat.onChatMessage((message => {
 
 WA.room.onEnterZone('myTrigger', () => {
     WA.chat.sendChatMessage("Don't step on my carpet!", 'Poly Parrot');
+    WA.chat.sendChatMessage("Yeah, don't step on her carpet!", 'Peter Parrot');
 })
 
 WA.room.onLeaveZone('popupZone', () => {
diff --git a/maps/tests/script_api.json b/maps/tests/script_api.json
index 73ef9d01..8e5534e9 100644
--- a/maps/tests/script_api.json
+++ b/maps/tests/script_api.json
@@ -13,7 +13,7 @@
          "width":10,
          "x":0,
          "y":0
-        }, 
+        },
         {
          "data":[0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":10,
@@ -31,7 +31,7 @@
          "width":10,
          "x":0,
          "y":0
-        }, 
+        },
         {
          "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":10,
@@ -49,7 +49,7 @@
          "width":10,
          "x":0,
          "y":0
-        }, 
+        },
         {
          "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":10,
@@ -61,7 +61,7 @@
          "width":10,
          "x":0,
          "y":0
-        }, 
+        },
         {
          "draworder":"topdown",
          "id":3,
@@ -77,7 +77,7 @@
                  "width":104.442827410047,
                  "x":142.817125079855,
                  "y":147.448134926559
-                }, 
+                },
                 {
                  "height":132.434722966794,
                  "id":2,
@@ -88,7 +88,7 @@
                  "width":125.735549178518,
                  "x":13.649632619596,
                  "y":50.8502491249093
-                }, 
+                },
                 {
                  "height":67,
                  "id":3,
@@ -98,7 +98,7 @@
                     {
                      "fontfamily":"Sans Serif",
                      "pixelsize":11,
-                     "text":"Test:\nWalk on top carpet\nResult:\nA message \"Don't step on my carpet\" is displayed",
+                     "text":"Test:\nWalk on top carpet\nResult:\nA message \"Don't step on my carpet\" is displayed from Poly Parrot and another message from Peter Parrot",
                      "wrap":true
                     },
                  "type":"",
@@ -106,7 +106,7 @@
                  "width":252.4375,
                  "x":2.78125,
                  "y":2.5
-                }, 
+                },
                 {
                  "height":67,
                  "id":4,
@@ -161,4 +161,4 @@
  "type":"map",
  "version":1.5,
  "width":10
-}
\ No newline at end of file
+}