diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 5cf723fe692..825b239560b 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -227,7 +227,8 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
     m_adbPath = AndroidConfigurations::currentConfig().adbToolPath().toString();
 
     AndroidAvdManager avdManager;
-    if (avdManager.findAvd(m_avdName).isEmpty())
+    // Start the AVD if not running.
+    if (!m_avdName.isEmpty() && avdManager.findAvd(m_avdName).isEmpty())
         avdManager.startAvdAsync(m_avdName);
     return true;
 }