diff --git a/.changeset/soft-planets-cross.md b/.changeset/soft-planets-cross.md
new file mode 100644
index 0000000000000..5a170ea222c24
--- /dev/null
+++ b/.changeset/soft-planets-cross.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a behavior of E2EE room creation that allowed any user on the room to define room keys before the room creator, causing race conditions.