diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index 20c48cf4..0a0fed5f 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -1250,11 +1250,9 @@ async fn validate_and_add_event_id(
 
     let unfiltered_keys = (*pub_key_map.read().await).clone();
 
-    let keys = services().globals.filter_keys_server_map(
-        unfiltered_keys,
-        origin_server_ts,
-        room_version,
-    );
+    let keys = services()
+        .globals
+        .filter_keys_server_map(unfiltered_keys, origin_server_ts);
 
     if let Err(error) =
         ruma::signatures::verify_event(&keys, &value, room_version)
diff --git a/src/service/globals.rs b/src/service/globals.rs
index 33dac38e..76817fcf 100644
--- a/src/service/globals.rs
+++ b/src/service/globals.rs
@@ -573,11 +573,10 @@ impl Service {
         &self,
         keys: BTreeMap<String, SigningKeys>,
         timestamp: MilliSecondsSinceUnixEpoch,
-        room_version_id: &RoomVersionId,
     ) -> BTreeMap<String, BTreeMap<String, Base64>> {
         keys.into_iter()
             .filter_map(|(server, keys)| {
-                self.filter_keys_single_server(keys, timestamp, room_version_id)
+                self.filter_keys_single_server(keys, timestamp)
                     .map(|keys| (server, keys))
             })
             .collect()
@@ -590,7 +589,6 @@ impl Service {
         &self,
         keys: SigningKeys,
         timestamp: MilliSecondsSinceUnixEpoch,
-        _room_version_id: &RoomVersionId,
     ) -> Option<BTreeMap<String, Base64>> {
         let all_valid = keys.valid_until_ts > timestamp;
 
diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs
index 07eed506..70a2a94b 100644
--- a/src/service/rooms/event_handler.rs
+++ b/src/service/rooms/event_handler.rs
@@ -365,11 +365,9 @@ impl Service {
 
             // Removing all the expired keys, unless the room version allows
             // stale keys
-            let filtered_keys = services().globals.filter_keys_server_map(
-                pkey_map,
-                origin_server_ts,
-                room_version_id,
-            );
+            let filtered_keys = services()
+                .globals
+                .filter_keys_server_map(pkey_map, origin_server_ts);
 
             let mut val = match ruma::signatures::verify_event(
                 &filtered_keys,