diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index 73b7cef75439e9275b75dc8c194d992a6b8ac86b..84e3f564c429b66a1de7b850b2c8a681e5abf3f4 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -111,7 +111,6 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
         params.executable = runConfig->localExecutableFilePath();
         params.debuggerCommand = runConfig->gdbCmd();
         params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1");
-        params.requestRemoteSetup = true;
 
         // TODO: This functionality should be inside the debugger.
         const ProjectExplorer::Abi &abi = runConfig->target()
@@ -122,6 +121,7 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
     } else {
         params.startMode = AttachToRemoteServer;
     }
+    params.requestRemoteSetup = true;
     params.displayName = runConfig->displayName();
 
     if (const ProjectExplorer::Project *project = runConfig->target()->project()) {