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 69abaee0b..f4bb18454 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -901,7 +901,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
                     }
 
                     boolean shouldScroll = layoutManager.findFirstVisibleItemPosition() == 0 ||
-                            adapter.getItemCount() == 0;
+                            (adapter != null && adapter.getItemCount() == 0);
 
                     if (!shouldScroll && popupBubble != null) {
                         if (!popupBubble.isShown()) {