diff --git a/src/config/mod.rs b/src/config/mod.rs
index 645f440d..3c3a764a 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -258,6 +258,6 @@ fn default_turn_ttl() -> u64 {
 }
 
 // I know, it's a great name
-fn default_default_room_version() -> RoomVersionId {
-    RoomVersionId::V6
+pub fn default_default_room_version() -> RoomVersionId {
+    RoomVersionId::V9
 }
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 942df1c3..5766b2f2 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -871,7 +871,7 @@ impl Service {
         let mut content = RoomCreateEventContent::new(conduit_user.clone());
         content.federate = true;
         content.predecessor = None;
-        content.room_version = RoomVersionId::V6;
+        content.room_version = services().globals.default_room_version();
 
         // 1. The room create event
         services().rooms.timeline.build_and_append_pdu(
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index d4c9dad0..affc0516 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -127,14 +127,10 @@ impl Service {
             RoomVersionId::V7,
             RoomVersionId::V8,
             RoomVersionId::V9,
-        ];
-        // Experimental, partially supported room versions
-        let unstable_room_versions = vec![
-            RoomVersionId::V3,
-            RoomVersionId::V4,
-            RoomVersionId::V5,
             RoomVersionId::V10,
         ];
+        // Experimental, partially supported room versions
+        let unstable_room_versions = vec![RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
 
         let mut s = Self {
             db,
@@ -172,8 +168,8 @@ impl Service {
             .supported_room_versions()
             .contains(&s.config.default_room_version)
         {
-            error!("Room version in config isn't supported, falling back to Version 6");
-            s.config.default_room_version = RoomVersionId::V6;
+            error!("Room version in config isn't supported, falling back to default version");
+            s.config.default_room_version = crate::config::default_default_room_version();
         };
 
         Ok(s)