diff --git a/.clangd b/.clangd
index 2d2d52668c2e9e..b0ceeaa684cdd4 100644
--- a/.clangd
+++ b/.clangd
@@ -6,6 +6,3 @@ CompileFlags:
 
 Diagnostics:
   UnusedIncludes: None
-
-HeaderInsertion:
-  IncludeBlocks: Preserve # Do not auto-include headers.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f7f738011685e0..11beb3deb7fcc8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -63,6 +63,7 @@
     "editor.tabSize": 4,
     "editor.defaultFormatter": "xaver.clang-format",
   },
+  "clangd.arguments": ["--header-insertion=never"],
 
   // JavaScript
   "prettier.enable": true,