diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d42ae5cc9e..345ff32915 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -8,6 +8,7 @@ Changelog
  * Increase `DATA_UPLOAD_MAX_NUMBER_FIELDS` in project template (Matt Westcott)
  * Stop invalid Site hostname records from breaking preview (Matt Westcott)
  * Set sensible defaults for InlinePanel heading and label (Matt Westcott)
+ * Limit tags autocompletion to 10 items to avoid performance issues with large number of matching tags (Aayushman Singh)
  * Fix: Improve handling of translations for bulk page action confirmation messages (Matt Westcott)
  * Fix: Ensure custom rich text feature icons are correctly handled when provided as a list of SVG paths (Temidayo Azeez, Joel William, LB (Ben) Johnston)
  * Fix: Ensure manual edits to `StreamField` values do not throw an error (Stefan Hammer)
diff --git a/docs/releases/6.4.md b/docs/releases/6.4.md
index cc049a4814..598ce06c75 100644
--- a/docs/releases/6.4.md
+++ b/docs/releases/6.4.md
@@ -18,6 +18,7 @@ depth: 1
  * Increase `DATA_UPLOAD_MAX_NUMBER_FIELDS` in project template (Matt Westcott)
  * Stop invalid Site hostname records from breaking preview (Matt Westcott)
  * Set sensible defaults for InlinePanel heading and label (Matt Westcott)
+ * Limit tags autocompletion to 10 items to avoid performance issues with large number of matching tags (Aayushman Singh)
 
 ### Bug fixes