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 e430b60d1..25d3626b0 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -494,7 +494,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
                     adapter.addToStart(chatMessageList.get(i), shouldScroll);
                 }
 
-                globalLastKnownFutureMessageId = Integer.parseInt(response.headers().get("X-Chat-Last-Given"));
+                String xChatLastGivenHeader;
+                if (response.headers().size() > 0 && !TextUtils.isEmpty((xChatLastGivenHeader = response.headers().get
+                        ("X-Chat-Last-Given")))) {
+                    globalLastKnownFutureMessageId = Integer.parseInt(xChatLastGivenHeader);
+                }
             }
 
             if (shouldForceFuture) {