diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp
index eb8636cc786..5266bed89fc 100644
--- a/src/plugins/android/androidgdbserverkitinformation.cpp
+++ b/src/plugins/android/androidgdbserverkitinformation.cpp
@@ -82,7 +82,8 @@ AndroidGdbServerKitAspect::AndroidGdbServerKitAspect()
 
 void AndroidGdbServerKitAspect::setup(Kit *kit)
 {
-    kit->setValue(id(), autoDetect(kit).toString());
+    if (kit && !kit->hasValue(id()))
+        kit->setValue(id(), autoDetect(kit).toString());
 }
 
 QList<Task> AndroidGdbServerKitAspect::validate(const Kit *) const
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 1b45f062ddd..8e3ed0290b1 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -692,6 +692,8 @@ QList<Task> CMakeGeneratorKitAspect::validate(const Kit *k) const
 
 void CMakeGeneratorKitAspect::setup(Kit *k)
 {
+    if (!k || k->hasValue(id()))
+        return;
     GeneratorInfo info;
     info.fromVariant(defaultValue(k));
     setGeneratorInfo(k, info);
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 1453a773907..5c6eb440661 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -805,7 +805,7 @@ DeviceTypeKitAspect::DeviceTypeKitAspect()
 
 void DeviceTypeKitAspect::setup(Kit *k)
 {
-    if (k)
+    if (k && !k->hasValue(id()))
         k->setValue(id(), QByteArray(Constants::DESKTOP_DEVICE_TYPE));
 }
 
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index 3cd0b2d36b7..dfa58e91a20 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -163,6 +163,8 @@ QtKitAspect::QtKitAspect()
 
 void QtKitAspect::setup(ProjectExplorer::Kit *k)
 {
+    if (!k || k->hasValue(id()))
+        return;
     const Abi tcAbi = ToolChainKitAspect::targetAbi(k);
     const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);