diff --git a/.clangd b/.clangd
index 12e13751d..70a1bf4bb 100644
--- a/.clangd
+++ b/.clangd
@@ -4,6 +4,10 @@ CompileFlags:
         - -Wno-format
     Remove: 
         - -mword-relocations
+    CompilationDatabase: "./build/latest"
+
+Completion:
+    HeaderInsertion: Never
 
 Diagnostics:
     ClangTidy:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bcd86495..55868962d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -188,6 +188,7 @@
   - Fix slashes in prefilled filename (by @WillyJL)
 - FBT: Fix redundant decl for apps using an icon disabled in API (by @WillyJL)
 - UL: Sub-GHz: Fix crash in add manually menu (by @xMasterX)
+- Clangd: Add clangd parameters in IDE agnostic config file (by @WillyJL)
 - OFW: GUI: Fix Number Input Save Icon (by @zinongli)
 - OFW: JS: Stop PWM on exit (by @portasynthinca3)
 - OFW: Sub-GHz: Fix TIM17 config not applied immediately (by @Aerosnail)