diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp
index 7c8b9a36711..795ac09f3c9 100644
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -60,20 +60,18 @@ AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory()
     setDefaultDisplayName(AndroidDeployConfiguration::tr("Deploy to Android device"));
 }
 
-QList<QString> AndroidDeployConfigurationFactory::availableBuildTargets(Target *parent) const
+bool AndroidDeployConfigurationFactory::hasAvailableBuildTargets(Target *parent) const
 {
     if (!parent->project()->id().name().startsWith("QmlProjectManager.QmlProject")) {
         // Avoid tool chain check for QML Project
         Core::Id cxxLangId(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
         ToolChain *tc = ToolChainKitInformation::toolChain(parent->kit(), cxxLangId);
         if (!tc || tc->targetAbi().osFlavor() != Abi::AndroidLinuxFlavor)
-            return {};
+            return false;
     }
 
     QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(parent->kit());
-    if (!qt || qt->type() != Constants::ANDROIDQT)
-        return {};
-    return {QString()};
+    return qt && qt->type() == Constants::ANDROIDQT;
 }
 
 } // namespace Internal
diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h
index f8b13fe1bc8..83970d5d483 100644
--- a/src/plugins/android/androiddeployconfiguration.h
+++ b/src/plugins/android/androiddeployconfiguration.h
@@ -44,7 +44,7 @@ class AndroidDeployConfigurationFactory : public ProjectExplorer::DeployConfigur
 public:
     AndroidDeployConfigurationFactory();
 
-    QList<QString> availableBuildTargets(ProjectExplorer::Target *parent) const override;
+    bool hasAvailableBuildTargets(ProjectExplorer::Target *parent) const override;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index cbac4040b50..16867591498 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -153,16 +153,14 @@ DeployConfigurationFactory::~DeployConfigurationFactory()
 
 QList<Core::Id> DeployConfigurationFactory::availableCreationIds(Target *parent) const
 {
-    if (!canHandle(parent))
-        return {};
-    return Utils::transform(availableBuildTargets(parent), [this](const QString &suffix) {
-        return m_deployConfigBaseId.withSuffix(suffix);
-    });
+    if (canHandle(parent) && hasAvailableBuildTargets(parent))
+        return {m_deployConfigBaseId};
+    return {};
 }
 
-QList<QString> DeployConfigurationFactory::availableBuildTargets(Target *) const
+bool DeployConfigurationFactory::hasAvailableBuildTargets(Target *) const
 {
-    return {QString()};
+    return true;
 }
 
 QString DeployConfigurationFactory::displayNameForBuildTarget(const QString &) const
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index e56e778579c..1b56c11d127 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -98,7 +98,7 @@ public:
 
 protected:
     virtual bool canHandle(ProjectExplorer::Target *target) const;
-    virtual QList<QString> availableBuildTargets(Target *parent) const;
+    virtual bool hasAvailableBuildTargets(Target *parent) const;
     virtual QString displayNameForBuildTarget(const QString &buildTarget) const;
 
     using DeployConfigurationCreator = std::function<DeployConfiguration *(Target *)>;