diff --git a/changelog.d/7177.bugfix b/changelog.d/7177.bugfix
new file mode 100644
index 000000000..908801c36
--- /dev/null
+++ b/changelog.d/7177.bugfix
@@ -0,0 +1 @@
+Mitigation for a bug in `_get_e2e_device_keys_txn` which broke federation for some servers.
\ No newline at end of file