diff --git a/src/plugins/projectexplorer/treescanner.cpp b/src/plugins/projectexplorer/treescanner.cpp
index 870ec538179..809c131df68 100644
--- a/src/plugins/projectexplorer/treescanner.cpp
+++ b/src/plugins/projectexplorer/treescanner.cpp
@@ -103,11 +103,12 @@ TreeScanner::Result TreeScanner::result() const
 
 TreeScanner::Result TreeScanner::release()
 {
-    if (isFinished()) {
+    if (isFinished() && m_scanFuture.resultCount() > 0) {
         auto result = m_scanFuture.result();
         m_scanFuture = Future();
         return result;
     }
+    m_scanFuture = Future();
     return Result();
 }