diff --git a/crates/matrix-sdk-search/changelog.d/6813.fixed.md b/crates/matrix-sdk-search/changelog.d/6813.fixed.md
new file mode 100644
index 000000000..502613887
--- /dev/null
+++ b/crates/matrix-sdk-search/changelog.d/6813.fixed.md
@@ -0,0 +1,5 @@
+Fix a possible overflow panic in Tantivy when a malformed timestamp is
+converted from milliseconds to nanoseconds. If the timestamp is too large,
+the conversion to nanoseconds was panicking. The timestamp now comes from
+`TimelineEvent::timestamp`, which already deals with malformed timestamp. In
+addition, the timestamp is capped in case the API is misused.