diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 6eb049a28..860d495e5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -869,7 +869,7 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
         fieldMap["includeLastKnown"] = 0
 
         var timeout = 30
-        if (lookIntoFuture == 0) {
+        if (lookIntoFuture == 0 || !lookingIntoFuture) {
             timeout = 0
         }