diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
index c297ef6838a..c49ad1ae3c3 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
@@ -250,7 +250,7 @@ Id CMakeKitAspect::cmakeToolId(const Kit *k)
 
 CMakeTool *CMakeKitAspect::cmakeTool(const Kit *k)
 {
-    return CMakeToolManager::findById(cmakeToolId(k));
+    return k->isAspectRelevant(id()) ? CMakeToolManager::findById(cmakeToolId(k)) : nullptr;
 }
 
 void CMakeKitAspect::setCMakeTool(Kit *k, const Id id)