diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
index c6213dd668e072f2b43faaad3562dc032f852fc6..689d92ca76056b16003f12ca82fcd8f6ce4b9d98 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
@@ -190,6 +190,11 @@ void BuiltinEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
 void BuiltinEditorDocumentProcessor::semanticRehighlight()
 {
     if (m_semanticHighlighter && m_semanticInfoUpdater.semanticInfo().doc) {
+        if (const CPlusPlus::Document::Ptr document = m_documentSnapshot.document(filePath())) {
+            m_codeWarnings = toTextEditorSelections(document->diagnosticMessages(), textDocument());
+            m_codeWarningsUpdated = false;
+        }
+
         m_semanticHighlighter->updateFormatMapFromFontSettings();
         m_semanticHighlighter->run();
     }