diff --git a/CHANGES.md b/CHANGES.md
index 3d027ae253..f0c23e693e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
 ### Bugfixes
 
 - Fix joining remote rooms when a module uses the `on_new_event` callback. This callback may now pass partial state events instead of the full state for remote rooms. Introduced in v1.76.0. ([\#16973](https://github.com/element-hq/synapse/issues/16973))
+- Fix performance issue when joining very large rooms that can cause the server to lock up. Introduced in v1.100.0. Contributed by @ggogel. ([\#16968](https://github.com/element-hq/synapse/issues/16968))
 
 ### Improved Documentation
 
diff --git a/changelog.d/16968.bugfix b/changelog.d/16968.bugfix
deleted file mode 100644
index 57ed851178..0000000000
--- a/changelog.d/16968.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent locking up when checking auth rules that are independent of room state for batched auth events. Contributed by @ggogel.
\ No newline at end of file