diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index ffff03082e1..eeaeb265ea5 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1060,10 +1060,12 @@ void DebuggerEngine::setRunId(const QString &id)
 void DebuggerEngine::setRunTool(DebuggerRunTool *runTool)
 {
     d->m_device = runTool->device();
-    QTC_ASSERT(d->m_device, d->m_device = DeviceManager::deviceForPath(
-                                d->m_runParameters.inferior.command.executable()));
-    if (QTC_GUARD(d->m_device))
-        d->m_runParameters.dumperPath = d->m_device->debugDumperPath();
+
+    IDevice::ConstPtr debuggerDevice =
+        DeviceManager::deviceForPath(d->m_runParameters.debugger.command.executable());
+    if (QTC_GUARD(debuggerDevice))
+        d->m_runParameters.dumperPath = debuggerDevice->debugDumperPath();
+
     d->m_terminalRunner = runTool->terminalRunner();
 
     validateRunParameters(d->m_runParameters);