diff --git a/changelog.d/2387.bugfix.md b/changelog.d/2387.bugfix.md
new file mode 100644
index 000000000..7c82bdffd
--- /dev/null
+++ b/changelog.d/2387.bugfix.md
@@ -0,0 +1 @@
+Fixed a worker panic when knocking on a room over federation. Contributed by @eleboucher.