diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 872c0f027f2..66bf3b1a2a2 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -402,7 +402,8 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit
         rp->remoteChannel = inputAddress;
     else
         rp->remoteChannel = rp->connParams.host;
-    rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort);
+    if (!rp->remoteChannel.isEmpty())
+        rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort);
     rp->displayName = newParameters.displayName();
     rp->inferior.workingDirectory = newParameters.runnable.workingDirectory;
     rp->useTerminal = newParameters.runnable.runMode == ApplicationLauncher::Console;