diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.cpp b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
index e26bfca1904..4abcab9e3e8 100644
--- a/src/tools/clangbackend/ipcsource/clangipcserver.cpp
+++ b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
@@ -30,6 +30,7 @@
 
 #include "clangipcserver.h"
 
+#include "clangfilesystemwatcher.h"
 #include "codecompleter.h"
 #include "diagnosticset.h"
 #include "projectpartsdonotexistexception.h"
@@ -64,8 +65,7 @@ ClangIpcServer::ClangIpcServer()
                                                           client()->diagnosticsChanged(message);
                                                       });
 
-    sendDiagnosticsTimer.setInterval(2000);
-    sendDiagnosticsTimer.setSingleShot(true);
+    sendDiagnosticsTimer.setInterval(1000);
     QObject::connect(&sendDiagnosticsTimer,
                      &QTimer::timeout,
                      [this] () { translationUnits.sendChangedDiagnostics(); });
diff --git a/src/tools/clangbackend/ipcsource/translationunits.cpp b/src/tools/clangbackend/ipcsource/translationunits.cpp
index b6c94e08c84..2e38e34fdd0 100644
--- a/src/tools/clangbackend/ipcsource/translationunits.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunits.cpp
@@ -136,8 +136,10 @@ void TranslationUnits::updateTranslationUnitsWithChangedDependencies(const Utf8S
 void TranslationUnits::sendChangedDiagnostics()
 {
     for (const auto &translationUnit : translationUnits_) {
-        if (translationUnit.hasNewDiagnostics())
+        if (translationUnit.hasNewDiagnostics()) {
              sendDiagnosticChangedMessage(translationUnit);
+             break;
+        }
     }
 }