diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
index 239bedf3f..817798ccc 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
@@ -19,6 +19,7 @@ import com.nextcloud.talk.models.json.conversations.Conversation
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import com.nextcloud.talk.repositories.conversations.ConversationsRepositoryImpl.Companion.STATUS_CODE_OK
 import com.nextcloud.talk.users.UserManager
+import com.nextcloud.talk.utils.CapabilitiesUtil
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
@@ -72,9 +73,11 @@ class ConversationCreationViewModel @Inject constructor(
     }
 
     fun updateConversationDescription(conversationDescription: String) {
-        _conversationDescription.value = conversationDescription
+        _conversationDescription.value = conversationDescription.take(
+            CapabilitiesUtil.conversationDescriptionLength(currentUser.capabilities?.spreedCapability!!))
     }
 
+
     @Suppress("Detekt.TooGenericExceptionCaught")
     fun createRoomAndAddParticipants(
         roomType: String,
diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
index ab72e226c..7d489873a 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
@@ -279,7 +279,9 @@ class ConversationInfoEditActivity : BaseActivity() {
 
     fun saveConversationDescription() {
         val conversationDescription = binding.conversationDescription.text.toString()
-        conversationInfoEditViewModel.setConversationDescription(conversation!!.token, conversationDescription)
+        val maxLengthConversationDescription = conversationDescription.take(CapabilitiesUtil
+            .conversationDescriptionLength(spreedCapabilities))
+        conversationInfoEditViewModel.setConversationDescription(conversation!!.token, maxLengthConversationDescription)
     }
 
     private fun handleResult(result: ActivityResult, onResult: (result: ActivityResult) -> Unit) {