diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 41d647d4b..d017f816c 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -2,10 +2,11 @@ import gql from 'graphql-tag'
 
 export const messageQuery = () => {
   return gql`
-    query ($roomId: ID!) {
-      Message(roomId: $roomId) {
+    query ($roomId: ID!, $first: Int, $offset: Int) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
         _id
         id
+        indexId
         senderId
         content
         author {