diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs
index c0cea412..b9d22049 100644
--- a/src/api/client_server/room.rs
+++ b/src/api/client_server/room.rs
@@ -146,7 +146,8 @@ pub async fn create_room_route(
                         })?,
                     );
                 }
-                _ => {} // V11 removed the "creator" key
+                RoomVersionId::V11 => {} // V11 removed the "creator" key
+                _ => panic!("Unexpected room version {}", room_version),
             }
 
             content.insert(
@@ -170,7 +171,8 @@ pub async fn create_room_route(
                 | RoomVersionId::V8
                 | RoomVersionId::V9
                 | RoomVersionId::V10 => RoomCreateEventContent::new_v1(sender_user.clone()),
-                _ => RoomCreateEventContent::new_v11(),
+                RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
+                _ => panic!("Unexpected room version {}", room_version),
             };
             let mut content = serde_json::from_str::<CanonicalJsonObject>(
                 to_raw_value(&content)
@@ -667,10 +669,11 @@ pub async fn upgrade_room_route(
                 })?,
             );
         }
-        _ => {
+        RoomVersionId::V11 => {
             // "creator" key no longer exists in V11 rooms
             create_event_content.remove("creator");
         }
+        _ => panic!("Unexpected room version {}", body.new_version)
     }
 
     create_event_content.insert(
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index fb905fd1..4ca81a95 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -1399,7 +1399,8 @@ impl Service {
             | RoomVersionId::V8
             | RoomVersionId::V9
             | RoomVersionId::V10 => RoomCreateEventContent::new_v1(conduit_user.clone()),
-            _ => RoomCreateEventContent::new_v11(),
+            RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
+            _ => panic!("Unexpected room version {}", room_version),
         };
 
         content.federate = true;
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index 7a7687f2..f7844cdb 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -423,7 +423,7 @@ impl Service {
                             self.redact_pdu(redact_id, pdu)?;
                         }
                     }
-                    _ => {
+                    RoomVersionId::V11 => {
                         #[derive(Deserialize)]
                         struct Redaction {
                             redacts: Option<OwnedEventId>,
@@ -437,6 +437,7 @@ impl Service {
                             self.redact_pdu(redact_id, pdu)?;
                         }
                     }
+                    _ => panic!("Unexpected room version {}", room_version_id)
                 };
             }
             TimelineEventType::SpaceChild => {