diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 3a5df5b6aea..ae2d2cc07eb 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -906,6 +906,9 @@ void ClangdClient::handleDiagnostics(const PublishDiagnosticsParams &params)
 {
     const DocumentUri &uri = params.uri();
     Client::handleDiagnostics(params);
+    const int docVersion = documentVersion(uri.toFilePath());
+    if (params.version().value_or(docVersion) != docVersion)
+        return;
     for (const Diagnostic &diagnostic : params.diagnostics()) {
         const ClangdDiagnostic clangdDiagnostic(diagnostic);
         for (const CodeAction &action : clangdDiagnostic.codeActions().value_or(QList<CodeAction>{}))