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 042e3859f..c41761014 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -909,7 +909,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
                     }
                 }
 
-                adapter.addToEnd(chatMessageList, false);
+                if (adapter != null) {
+                    adapter.addToEnd(chatMessageList, false);
+                }
 
             } else {