diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7180cf8ffa..02d51a99e6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -54,6 +54,7 @@ Changelog
  * Fix: Fix broken link to user search (Shlomo Markowitz)
  * Fix: Make sure content metrics falls back to body element only when intended (Sage Abdullah)
  * Fix: Remove wrongly-added filters from redirects index (Matt Westcott)
+ * Fix: Prevent popular tags filter from generating overly complex queries when not filtering (Matt Westcott)
  * Docs: Clarify process for UserViewSet customization (Sage Abdullah)
 
 
diff --git a/docs/releases/6.2.2.md b/docs/releases/6.2.2.md
index c2d64ab363..cf114cc357 100644
--- a/docs/releases/6.2.2.md
+++ b/docs/releases/6.2.2.md
@@ -18,6 +18,7 @@ depth: 1
  * Fix broken link to user search (Shlomo Markowitz)
  * Make sure content metrics falls back to body element only when intended (Sage Abdullah)
  * Remove wrongly-added filters from redirects index (Matt Westcott)
+ * Prevent popular tags filter from generating overly complex queries when not filtering (Matt Westcott)
 
 
 ### Documentation