diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 4ab59c9b3..83c967cf2 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -327,7 +327,6 @@ class ConversationInfoActivity :
             when (state) {
                 is ConversationInfoViewModel.GetCapabilitiesSuccessState -> {
                     spreedCapabilities = state.spreedCapabilities
-
                     handleConversation()
                 }
 
@@ -905,8 +904,7 @@ class ConversationInfoActivity :
 
     @Suppress("LongMethod")
     private fun handleConversation() {
-        val conversationCopy = conversation!!
-
+        val conversationCopy = conversation ?: return
         setUpNotificationSettings(databaseStorageModule!!)
 
         if (hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.RICH_OBJECT_LIST_MEDIA) &&