diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index b0609edd6..a9d5b05b8 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -56,7 +56,7 @@ export class WsChatMethodsService {
 
       room.receiveMessage()
 
-      let roomId = roomData.lastMessage.rid
+      let roomId = this.getRoomId(roomData)
 
       if(this.isIndividual(roomData)) {
         this.dm[roomId] = room
@@ -116,7 +116,7 @@ export class WsChatMethodsService {
   }
 
   getRoomId(roomData:room) {
-    return roomData.lastMessage.rid
+    return roomData._id
   }
 
   getRoomLastMessage(roomData: room) {