diff --git a/src/python/matrix_client.py b/src/python/matrix_client.py
index a778be01..5ff811e0 100644
--- a/src/python/matrix_client.py
+++ b/src/python/matrix_client.py
@@ -458,8 +458,8 @@ class MatrixClient(nio.AsyncClient):
     ) -> str:
 
         response = await super().room_create(
-            name       = name,
-            topic      = topic,
+            name       = name or None,
+            topic      = topic or None,
             federate   = federate,
             visibility =
                 nio.RoomVisibility.public if public else
diff --git a/src/qml/Pages/AddChat/CreateRoom.qml b/src/qml/Pages/AddChat/CreateRoom.qml
index f0b5b341..9771fc41 100644
--- a/src/qml/Pages/AddChat/CreateRoom.qml
+++ b/src/qml/Pages/AddChat/CreateRoom.qml
@@ -20,8 +20,8 @@ HBox {
             errorMessage.text = ""
 
             let args = [
-                nameField.text || null,
-                topicField.text || null,
+                nameField.text,
+                topicField.text,
                 publicCheckBox.checked,
                 encryptCheckBox.checked,
                 ! blockOtherServersCheckBox.checked,