diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp
index 0b4230ab33a..e76b3b60eff 100644
--- a/src/plugins/baremetal/defaultgdbserverprovider.cpp
+++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp
@@ -67,6 +67,8 @@ QString DefaultGdbServerProvider::typeDisplayName() const
 QString DefaultGdbServerProvider::channel() const
 {
     // Just return as "host:port" form.
+    if (m_port == 0)
+        return m_host;
     return m_host + QLatin1Char(':') + QString::number(m_port);
 }
 
diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp
index ee523587362..5f49c5d0853 100644
--- a/src/plugins/baremetal/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/gdbserverprovider.cpp
@@ -374,7 +374,7 @@ HostWidget::HostWidget(QWidget *parent)
     m_hostLineEdit->setToolTip(tr("Enter TCP/IP hostname of the GDB server provider, "
                                   "like \"localhost\" or \"192.0.2.1\"."));
     m_portSpinBox = new QSpinBox(this);
-    m_portSpinBox->setRange(1, 65535);
+    m_portSpinBox->setRange(0, 65535);
     m_portSpinBox->setToolTip(tr("Enter TCP/IP port which will be listened by "
                                  "the GDB server provider."));
     auto layout = new QHBoxLayout(this);