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 2ee9276c2..759637cde 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
@@ -96,7 +96,9 @@ class ConversationCreationViewModel @Inject constructor(
                                     }
                                 }
                             }
-                            repository.setPassword(token, _password.value)
+                            if (_password.value.isNotEmpty()) {
+                                repository.setPassword(token, _password.value)
+                            }
                             repository.openConversation(token, scope)
                             onRoomCreated(token)
                         } catch (exception: Exception) {
@@ -134,6 +136,7 @@ class ConversationCreationViewModel @Inject constructor(
         }
     }
 }
+
 sealed class AllowGuestsUiState {
     data object None : AllowGuestsUiState()
     data class Success(val result: Boolean) : AllowGuestsUiState()