diff --git a/src/lib/data/indexer/TaskBuildIndex.cpp b/src/lib/data/indexer/TaskBuildIndex.cpp
index 927e6178..5babf423 100644
--- a/src/lib/data/indexer/TaskBuildIndex.cpp
+++ b/src/lib/data/indexer/TaskBuildIndex.cpp
@@ -117,7 +117,10 @@ Task::TaskState TaskBuildIndex::doUpdate(std::shared_ptr<Blackboard> blackboard)
 		return STATE_FAILURE;
 	}
 
-	fetchIntermediateStorages(blackboard);
+	if (fetchIntermediateStorages(blackboard))
+	{
+		updateIndexingDialog(blackboard, FilePath());
+	}
 
 	const int SLEEP_TIME_MS = 50;
 	std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_TIME_MS));
diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp
index 6699c515..f8499dbb 100644
--- a/src/lib_gui/qt/window/QtIndexingDialog.cpp
+++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp
@@ -262,7 +262,11 @@ void QtIndexingDialog::updateIndexingProgress(size_t fileCount, size_t totalFile
 		progress = fileCount * 100 / totalFileCount;
 	}
 
-	m_sourcePath = QString::fromStdString(sourcePath);
+	if (sourcePath.size())
+	{
+		m_sourcePath = QString::fromStdString(sourcePath);
+	}
+
 	updateProgress(progress);
 }