diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
index 4b95fe11b5..0638284ba9 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
@@ -244,7 +244,7 @@ fun ConversationCreationScreen(
 
                 if (
                     CapabilitiesUtil.hasSpreedFeatureCapability(
-                        conversationCreationViewModel.currentUser.capabilities?.spreedCapability!!,
+                        conversationCreationViewModel.currentUser.capabilities?.spreedCapability,
                         SpreedFeatures.CONVERSATION_PRESETS
                     )
                 ) {
@@ -362,14 +362,14 @@ fun ConversationNameAndDescription(conversationCreationViewModel: ConversationCr
         onValueChange = {
             if (it.length > CapabilitiesUtil.conversationDescriptionLength(
                     conversationCreationViewModel.currentUser
-                        .capabilities?.spreedCapability!!
+                        .capabilities?.spreedCapability
                 )
             ) {
                 conversationCreationViewModel.updateConversationDescription(
                     it.take(
                         CapabilitiesUtil.conversationDescriptionLength(
                             conversationCreationViewModel.currentUser
-                                .capabilities?.spreedCapability!!
+                                .capabilities?.spreedCapability
                         )
                     )
                 )
diff --git a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
index 0c9f9a47a8..1218e569d5 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
@@ -161,8 +161,8 @@ object CapabilitiesUtil {
         return DEFAULT_MAX_GIF_SIZE
     }
 
-    fun conversationDescriptionLength(spreedCapabilities: SpreedCapability): Int {
-        if (spreedCapabilities.config?.containsKey("conversations") == true) {
+    fun conversationDescriptionLength(spreedCapabilities: SpreedCapability?): Int {
+        if (spreedCapabilities?.config?.containsKey("conversations") == true) {
             val map: Map<String, Any>? = spreedCapabilities.config!!["conversations"]
             if (map != null && map.containsKey("description-length")) {
                 return (map["description-length"].toString().toInt())