diff --git a/changelog.d/11012.bugfix b/changelog.d/11012.bugfix
new file mode 100644
index 000000000000..13b8e5983b73
--- /dev/null
+++ b/changelog.d/11012.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug which meant that events received over federation were sometimes incorrectly accepted into the room state.