diff --git a/docker/complement/conf/workers-shared-extra.yaml.j2 b/docker/complement/conf/workers-shared-extra.yaml.j2
index 9fd7fc954a..ea308d0685 100644
--- a/docker/complement/conf/workers-shared-extra.yaml.j2
+++ b/docker/complement/conf/workers-shared-extra.yaml.j2
@@ -163,5 +163,6 @@ caches:
 room_list_publication_rules:
   - action: allow
 
+default_room_version: "11"
 
 {% include "shared-orig.yaml.j2" %}
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 3b57531fa4..1b1a973930 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -175,7 +175,7 @@ def generate_ip_set(
     "fec0::/10",
 ]
 
-DEFAULT_ROOM_VERSION = "10"
+DEFAULT_ROOM_VERSION = "11"
 
 ROOM_COMPLEXITY_TOO_GREAT = (
     "Your homeserver is unable to join rooms this large or complex. "