diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 96bdef518..1eae487f5 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -232,10 +232,10 @@ export default {
     },
 
     async fetchMessages({ room, options = {} }) {
-      if (this.selectedRoom !== room.id) {
+      if (this.selectedRoom?.id !== room.id) {
         this.messages = []
         this.messagePage = 0
-        this.selectedRoom = room.id
+        this.selectedRoom = room
       }
       this.messagesLoaded = options.refetch ? this.messagesLoaded : false
       const offset = (options.refetch ? 0 : this.messagePage) * this.messagePageSize