diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 1b5e63d9e..478a25932 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -992,7 +992,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
         fieldMap.put("includeLastKnown", 0);
 
         if (lookIntoFuture > 0) {
+            int timeout = 30;
+            if (!lookingIntoFuture ) {
+                timeout = 0;
+            }
+
             lookingIntoFuture = true;
+            fieldMap.put("timeout", timeout);
         } else if (isFirstMessagesProcessing) {
             globalLastKnownFutureMessageId = currentConversation.getLastReadMessage();
             globalLastKnownPastMessageId = currentConversation.getLastReadMessage();