diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index a2f307075d229616030f4da222c3995e131c26da..2a2ef6ec1d936b782d8bf16898afdfbbc2945c6a 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -198,6 +198,7 @@ void BuildManager::clearBuildQueue()
     m_buildQueue.clear();
     m_running = false;
     m_previousBuildStepProject = 0;
+    m_currentBuildStep = 0;
 
     m_progressFutureInterface->reportCanceled();
     m_progressFutureInterface->reportFinished();
@@ -353,6 +354,7 @@ void BuildManager::nextStep()
         m_previousBuildStepProject = 0;
         m_progressFutureInterface->reportFinished();
         m_progressWatcher.setFuture(QFuture<void>());
+        m_currentBuildStep = 0;
         delete m_progressFutureInterface;
         m_progressFutureInterface = 0;
         m_maxProgress = 0;