diff --git a/changelog.d/5801.misc b/changelog.d/5801.misc
new file mode 100644
index 000000000..e6ecb475d
--- /dev/null
+++ b/changelog.d/5801.misc
@@ -0,0 +1 @@
+Don't allow clients to send tombstone events that reference the room its sent in.