diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index c455d4f89cfefea5b075125352dbf66acc73887b..769448f003818cae05bfb2d986aa52044d136482 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1479,7 +1479,9 @@ void DebuggerPlugin::startRemoteApplication()
     sp->remoteChannel = dlg.remoteChannel();
     sp->remoteArchitecture = dlg.remoteArchitecture();
     sp->executable = dlg.localExecutable();
-    sp->debuggerCommand = dlg.debugger();
+    sp->debuggerCommand = dlg.debugger(); // Override toolchain-detection.
+    if (!sp->debuggerCommand.isEmpty())
+        sp->toolChainType = ProjectExplorer::ToolChain::INVALID;
     sp->startMode = StartRemote;
     if (dlg.useServerStartScript())
         sp->serverStartScript = dlg.serverStartScript();