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 1886bcb10..53dae55bc 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -855,9 +855,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
                 NotificationUtils.cancelExistingNotifications(getApplicationContext(), conversationUser);
 
                 isFirstMessagesProcessing = false;
-                loadingProgressBar.setVisibility(View.GONE);
+                if (loadingProgressBar != null) {
+                    loadingProgressBar.setVisibility(View.GONE);
+                }
 
-                if (emptyLayout.getVisibility() != View.VISIBLE) {
+                if (emptyLayout != null && emptyLayout.getVisibility() != View.VISIBLE) {
                     emptyLayout.setVisibility(View.VISIBLE);
                 }
             }