diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9f0d3519..0e95006d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
   - Fixes to `READ_MULTI` and `GET_BLOCK_SECURITY` commands in ISO 15693-3 emulation (#501 by @WillyJL & aaronjamt)
   - Fix CLI with NTAG4xx and Type 4 Tag support (by @WillyJL)
   - UL: Fix LED not blinking at SLIX unlock (by @xMasterX)
+- uFBT: Fix .clangd config for IDEs besides VSCode
 - UL: Settings: Storage settings exit scenes properly if used via favourites (by @xMasterX)
 - UL: UI: Some small changes (by @xMasterX)
 - OFW: USB: Fix USB HID keyboard LED state reporting (by @Caballosanex)
diff --git a/scripts/ufbt/project_template/.clangd b/scripts/ufbt/project_template/.clangd
index 12e13751d..0e6e141bd 100644
--- a/scripts/ufbt/project_template/.clangd
+++ b/scripts/ufbt/project_template/.clangd
@@ -4,6 +4,10 @@ CompileFlags:
         - -Wno-format
     Remove: 
         - -mword-relocations
+    CompilationDatabase: "./.vscode"
+
+Completion:
+    HeaderInsertion: Never
 
 Diagnostics:
     ClangTidy: