diff --git a/book/changelog.md b/book/changelog.md
index 2d04d10d..f8e94d62 100644
--- a/book/changelog.md
+++ b/book/changelog.md
@@ -103,7 +103,8 @@ This will be the first release of Grapevine since it was forked from Conduit
    [!50](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/50),
    [!52](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/52),
    [!54](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/54),
-   [!56](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/56))
+   [!56](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/56),
+   [!69](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/69))
 5. Stop returning unnecessary member counts from `/_matrix/client/{r0,v3}/sync`.
    ([!12](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/12))
 6. **BREAKING:** Allow federation by default.
diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs
index 9d2f2d81..0e423e72 100644
--- a/src/api/client_server/keys.rs
+++ b/src/api/client_server/keys.rs
@@ -430,6 +430,8 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
             for (user_id, keys) in vec {
                 device_keys_input_fed.insert(user_id.to_owned(), keys.clone());
             }
+            // TODO: switch .and_then(|result| result) to .flatten() when stable
+            // <https://github.com/rust-lang/rust/issues/70142>
             (
                 server,
                 tokio::time::timeout(
@@ -443,8 +445,6 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
                 )
                 .await
                 .map_err(|_e| Error::BadServerResponse("Query took too long"))
-                // TODO: switch to .flatten() when stable
-                // <https://github.com/rust-lang/rust/issues/70142>
                 .and_then(|result| result),
             )
         })