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 9a7e2f0d181..95560f88a55 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
@@ -227,7 +227,7 @@ fun ConversationCreationScreen(
 
                 if (
                     CapabilitiesUtil.hasSpreedFeatureCapability(
-                        conversationCreationViewModel.currentUser.capabilities?.spreedCapability!!,
+                        conversationCreationViewModel.currentUser.capabilities?.spreedCapability,
                         SpreedFeatures.CONVERSATION_PRESETS
                     )
                 ) {
@@ -354,14 +354,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 e1725446804..bf9d5b8ba90 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
@@ -157,8 +157,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())