diff --git a/changelog.d/2400.bugfix.md b/changelog.d/2400.bugfix.md
new file mode 100644
index 000000000..406586732
--- /dev/null
+++ b/changelog.d/2400.bugfix.md
@@ -0,0 +1 @@
+Perform more validation on events received during atomic gapfill from remote servers, fixing a panic if bad data was persisted by another server and later lazily fetched by us.