diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index c5f014cd..484fc134 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -978,7 +978,7 @@ impl Service {
             | RoomVersionId::V9
             | RoomVersionId::V10 => RoomCreateEventContent::new_v1(conduit_user.clone()),
             RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
-            _ => panic!("Unexpected room version {}", room_version),
+            _ => unreachable!("Validity of room version already checked"),
         };
         content.federate = true;
         content.predecessor = None;
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index cab61c66..3eb49e10 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -178,13 +178,13 @@ impl Service {
             RoomVersionId::V8,
             RoomVersionId::V9,
             RoomVersionId::V10,
+            RoomVersionId::V11,
         ];
         // Experimental, partially supported room versions
         let unstable_room_versions = vec![
             RoomVersionId::V3,
             RoomVersionId::V4,
             RoomVersionId::V5,
-            RoomVersionId::V11,
         ];
 
         let mut s = Self {
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index dff727af..2aeffa60 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -407,7 +407,7 @@ impl Service {
                             self.redact_pdu(redact_id, pdu)?;
                         }
                     }
-                    _ => panic!("Unexpected room version {}", room_version_id)
+                    _ => unreachable!("Validity of room version already checked")
                 };
             }
             TimelineEventType::SpaceChild => {