diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fedaeedba..dd724d200 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,7 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.push(this.fixRoomObject(r))
+            rms.unshift(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
@@ -405,7 +405,7 @@ export default {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
-        index: room.lastMessage?.date,
+        index: room.lastMessage? room.lastMessage.date : room.createdAt,
         lastMessage: room.lastMessage
           ? {
               ...room.lastMessage,
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 077d73f9a..4e9cd0209 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -7,6 +7,7 @@ export const createRoom = () => gql`
       roomId
       roomName
       lastMessageAt
+      createdAt
       unreadCount
       #avatar
       users {
@@ -29,6 +30,7 @@ export const roomQuery = () => gql`
       roomName
       avatar
       lastMessageAt
+      createdAt
       unreadCount
       lastMessage {
         _id