diff --git a/changelog.d/5851.bugfix b/changelog.d/5851.bugfix
new file mode 100644
index 000000000..6da40e6e3
--- /dev/null
+++ b/changelog.d/5851.bugfix
@@ -0,0 +1,2 @@
+Fixes 500 Internal Server Error on `publicRooms` when the public room list was
+cached.
\ No newline at end of file