diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 698a270b7..320ea3357 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -245,6 +245,7 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage.date,
+              lastMessage: {...r.lastMessage, content: r.lastMessage.content.trim().substring(0,30)},
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -336,6 +337,7 @@ export default {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
       const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
+      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
@@ -360,6 +362,12 @@ export default {
             content: message.content,
           },
         })
+        const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
+        const changedRoom = { ...this.rooms[roomIndex] }
+        console.log(changedRoom)
+        changedRoom.lastMessage = message
+        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+        this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)
       }