diff --git a/crates/ruma-federation-api/CHANGELOG.md b/crates/ruma-federation-api/CHANGELOG.md
index e1f2287a..338439df 100644
--- a/crates/ruma-federation-api/CHANGELOG.md
+++ b/crates/ruma-federation-api/CHANGELOG.md
@@ -1,5 +1,9 @@
 # [unreleased]
 
+Improvements:
+
+* Fix JSON body (de)serialization of `discovery::get_remote_server_keys::batch::v2::Request`
+
 # 0.3.0
 
 Breaking changes:
diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
index 6111501f..5e86cf27 100644
--- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
+++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
@@ -20,26 +20,23 @@ ruma_api! {
     }
 
     request: {
-        /// The query criteria. The outer string key on the object is the server
-        /// name (eg: matrix.org). The inner string key is the Key ID to query
-        /// for the particular server. If no key IDs are given to be queried,
-        /// the notary server should query for all keys. If no servers are
-        /// given, the notary server must return an empty server_keys array in
-        /// the response.
-        ///
-        /// The notary server may return multiple keys regardless of the Key IDs
-        /// given.
-        #[ruma_api(body)]
-        pub server_keys: BTreeMap<ServerNameBox, BTreeMap<ServerSigningKeyId, QueryCriteria>>,
-
-        /// A millisecond POSIX timestamp in milliseconds indicating when the
-        /// returned certificates will need to be valid until to be useful to
+        /// The time until which the returned certificates will need to be valid to be useful to
         /// the requesting server.
         ///
-        /// If not supplied, the current time as determined by the notary server
-        /// is used.
+        /// If not supplied, the current time as determined by the notary server is used.
         #[ruma_api(query)]
         pub minimum_valid_until_ts: MilliSecondsSinceUnixEpoch,
+
+        /// The query criteria.
+        ///
+        /// The outer string key on the object is the server name (eg: matrix.org). The inner
+        /// string key is the Key ID to query for the particular server. If no key IDs are given to
+        /// be queried, the notary server should query for all keys. If no servers are given, the
+        /// notary server must return an empty server_keys array in the response.
+        ///
+        /// The notary server may return multiple keys regardless of the Key IDs given.
+        pub server_keys: BTreeMap<ServerNameBox, BTreeMap<ServerSigningKeyId, QueryCriteria>>,
+
     }
 
     response: {