diff --git a/.clang-tidy b/.clang-tidy
index cc7014b8..2f3d2718 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -33,7 +33,8 @@ Checks: "-*,
   -bugprone-easily-swappable-parameters,
   -cert-err58-cpp,
   -modernize-avoid-c-arrays,
-  -misc-include-cleaner
+  -misc-include-cleaner,
+  -llvm-prefer-static-over-anonymous-namespace
   "
 CheckOptions:
   - key: readability-identifier-naming.ClassCase
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae990699..261da82e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 - Dev: Added method to get the last N messages of a channel. (#6602, #6604)
 - Dev: Unwrapped `LimitedQueueSnapshot` to `std::vector`. (#6606)
 - Dev: Simplified uses of `getMessageSnapshot`. (#6607)
+- Dev: Disabled `llvm-prefer-static-over-anonymous-namespace` in clang-tidy. (#6610)
 
 ## 2.5.4