diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index d3ede30b10a..c6cbd2185da 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -46,6 +46,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectnodes.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
@@ -767,6 +768,15 @@ QList<Text::Range> ClangdClient::additionalDocumentHighlights(
         qobject_cast<CppEditor::CppEditorWidget *>(editorWidget), cursor);
 }
 
+bool ClangdClient::shouldSendDidSave(const TextEditor::TextDocument *doc) const
+{
+    for (const Project * const p : ProjectManager::projects()) {
+        if (const Node * const n  = p->nodeForFilePath(doc->filePath()))
+            return n->asFileNode() && n->asFileNode()->fileType() == FileType::Header;
+    }
+    return CppEditor::ProjectFile::isHeader(doc->filePath());
+}
+
 RefactoringFilePtr ClangdClient::createRefactoringFile(const FilePath &filePath) const
 {
     return CppEditor::CppRefactoringChanges(CppEditor::CppModelManager::snapshot()).file(filePath);
diff --git a/src/plugins/clangcodemodel/clangdclient.h b/src/plugins/clangcodemodel/clangdclient.h
index c0f687ea1fc..5a12c8f56d7 100644
--- a/src/plugins/clangcodemodel/clangdclient.h
+++ b/src/plugins/clangcodemodel/clangdclient.h
@@ -148,7 +148,7 @@ private:
     bool fileBelongsToProject(const Utils::FilePath &filePath) const override;
     QList<Utils::Text::Range> additionalDocumentHighlights(
         TextEditor::TextEditorWidget *editorWidget, const QTextCursor &cursor) override;
-
+    bool shouldSendDidSave(const TextEditor::TextDocument *doc) const override;
 
     class Private;
     class VirtualFunctionAssistProcessor;
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index f56538d6cbe..c12693e4808 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -1173,7 +1173,7 @@ void Client::documentContentsSaved(TextEditor::TextDocument *document)
                 includeText = saveOptions->includeText().value_or(includeText);
         }
     }
-    if (!send)
+    if (!send || !shouldSendDidSave(document))
         return;
     DidSaveTextDocumentParams params(
                 TextDocumentIdentifier(hostPathToServerUri(document->filePath())));
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index a881d178242..c80e458a472 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -235,6 +235,7 @@ private:
                                       const Utils::FilePath &candidate);
     virtual QList<Utils::Text::Range> additionalDocumentHighlights(
         TextEditor::TextEditorWidget *, const QTextCursor &) { return {}; }
+    virtual bool shouldSendDidSave(const TextEditor::TextDocument *) const { return true; }
 };
 
 } // namespace LanguageClient