diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 08c7fd26b8d39a7aea697eada2ea3a2575279617..d6d1e04ad1830a644fe65c3f36887ebc3aa5eafb 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -726,6 +726,11 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
     sp.executable = rc->executable();
     sp.processArgs = rc->commandLineArguments();
     sp.toolChainAbi = rc->abi();
+    if (!sp.toolChainAbi.isValid()) {
+        QList<Abi> abis = Abi::abisOfBinary(sp.executable);
+        if (!abis.isEmpty())
+            sp.toolChainAbi = abis.at(0);
+    }
     sp.useTerminal = rc->runMode() == LocalApplicationRunConfiguration::Console;
     sp.dumperLibrary = rc->dumperLibrary();
     sp.dumperLibraryLocations = rc->dumperLibraryLocations();
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 8305b1e2932424a22a62b50ba460a027fb36bfc9..345f3ffa7ce763f4c1b3a43eb1123d72f0b2889b 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -337,7 +337,7 @@ QStringList CustomExecutableRunConfiguration::dumperLibraryLocations() const
 
 ProjectExplorer::Abi CustomExecutableRunConfiguration::abi() const
 {
-    return ProjectExplorer::Abi::hostAbi();
+    return Abi(); // return an invalid ABI: We do not know what we will end up running!
 }
 
 // Factory