diff --git a/changelog.d/3612.misc b/changelog.d/3612.misc
new file mode 100644
index 000000000..f90d2f2ff
--- /dev/null
+++ b/changelog.d/3612.misc
@@ -0,0 +1 @@
+Make EventStore inherit from EventFederationStore