diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
index b31125fbb33..21605c321c6 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
@@ -153,6 +153,9 @@ void CompilationDbParser::parserJobFinished()
 
 void CompilationDbParser::finish(ParseResult result)
 {
+    if (result != ParseResult::Failure)
+        m_guard.markAsSuccess();
+
     emit finished(result);
     deleteLater();
 }
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h
index 72425fa3c51..b5e97a8840c 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h
@@ -69,7 +69,6 @@ public:
     QList<ProjectExplorer::FileNode *> scannedFiles() const;
     DbContents dbContents() const
     {
-        m_guard.markAsSuccess();
         return m_dbContents;
     }