diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
index c853df8b265..7cd8d3f7002 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
@@ -96,7 +96,8 @@ CommandLine StLinkUtilGdbServerProvider::command() const
     if (!m_resetBoard)
         cmd.addArg("--no-reset");
 
-    cmd.addArg("--stlink_version=" + QString::number(m_transport));
+    if (m_transport != UnspecifiedTransport)
+        cmd.addArg("--stlink_version=" + QString::number(m_transport));
     cmd.addArg("--listen_port=" + QString::number(channel().port()));
     cmd.addArg("--verbose=" + QString::number(m_verboseLevel));
 
@@ -301,6 +302,9 @@ void StLinkUtilGdbServerProviderConfigWidget::populateTransportLayers()
     m_transportLayerComboBox->insertItem(
                 m_transportLayerComboBox->count(), tr("ST-LINK/V2"),
                 StLinkUtilGdbServerProvider::RawUsb);
+    m_transportLayerComboBox->insertItem(
+                m_transportLayerComboBox->count(), tr("Keep unspecified"),
+                StLinkUtilGdbServerProvider::UnspecifiedTransport);
 }
 
 void StLinkUtilGdbServerProviderConfigWidget::setFromProvider()
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
index a5d8a6f82a7..6cef0ea9c2c 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
@@ -42,7 +42,7 @@ namespace Internal {
 class StLinkUtilGdbServerProvider final : public GdbServerProvider
 {
 public:
-    enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2 };
+    enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2, UnspecifiedTransport };
 
     QVariantMap toMap() const final;
     bool fromMap(const QVariantMap &data) final;