diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index c38f50672ad..2c26207c83e 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -919,7 +919,10 @@ void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg)
     worker->d->state = RunWorkerState::Done;
 
     showError(msg);
-    initiateStop();
+    if (state == RunControlState::Running || state == RunControlState::Starting)
+        initiateStop();
+    else
+        continueStopOrFinish();
 }
 
 void RunControlPrivate::onWorkerStopped(RunWorker *worker)