diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 6e20887d701..a3b12fbeab0 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -247,7 +247,9 @@ BuildSystem *BuildStep::buildSystem() const
 
 Environment BuildStep::buildEnvironment() const
 {
-    if (auto bc = buildConfiguration())
+    if (const auto bc = qobject_cast<BuildConfiguration *>(parent()->parent()))
+        return bc->environment();
+    if (const auto bc = target()->activeBuildConfiguration())
         return bc->environment();
     return Environment::systemEnvironment();
 }
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index c411ac34c9b..5bdf0d5f982 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -183,9 +183,6 @@ static const QList<ToolChain *> preferredToolChains(const Kit *kit)
 
 FilePath MakeStep::defaultMakeCommand() const
 {
-    BuildConfiguration *bc = buildConfiguration();
-    if (!bc)
-        return {};
     const Utils::Environment env = makeEnvironment();
     for (const ToolChain *tc : preferredToolChains(kit())) {
         FilePath make = tc->makeCommand(env);