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 423532251..050d99d87 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -528,7 +528,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
         messageInputView.getButton().setContentDescription(getResources()
                 .getString(R.string.nc_description_send_message_button));
 
-        if (currentConversation.getRoomId() != null) {
+        if (currentConversation != null && currentConversation.getRoomId() != null) {
             loadAvatarForStatusBar();
             checkLobbyState();
         }
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
index 626d4b59e..7bb2830ca 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
@@ -615,7 +615,7 @@ public class NotificationWorker extends Worker {
                                     break;
                                 case "room":
                                     if (bundle.containsKey(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN())) {
-                                        showNotificationForCallWithNoPing(intent);
+                                        showNotificationWithObjectData(intent);
                                     }
                                     break;
                                 case "chat":