diff --git a/lib/structs/events/create.cpp b/lib/structs/events/create.cpp
index 33bf4ee02614a1efa87bfeab122bbe998d0deaae..62696462d48b33cb9413f63c3905d2302cf0d183 100644
--- a/lib/structs/events/create.cpp
+++ b/lib/structs/events/create.cpp
@@ -47,11 +47,10 @@ from_json(const json &obj, Create &create)
 void
 to_json(json &obj, const Create &create)
 {
-    obj["creator"]    = create.creator;
+    if (!create.creator.empty())
+        obj["creator"] = create.creator;
     obj["m.federate"] = create.federate;
-    if (create.room_version.empty())
-        obj["room_version"] = "1";
-    else
+    if (!create.room_version.empty())
         obj["room_version"] = create.room_version;
 
     if (create.type)