diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index db0926bbf7f2f8bc09dd0f6a12acbdbfea74ecea..4d5be69aba8da7505f9bbeb37f03b0d3b84234ee 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -481,10 +481,13 @@ void LinkManager::_updateConfigurationList(void)
                 }
             } else {
                 // Lets create a new Serial configuration automatically
-		if (portInfo.description() == "AeroCore")
-	                pSerial = new SerialConfiguration(QString("AeroCore on %1").arg(portInfo.portName().trimmed()));
-		else
-	                pSerial = new SerialConfiguration(QString("Pixhawk on %1").arg(portInfo.portName().trimmed()));
+                if (portInfo.description() == "AeroCore") {
+                    pSerial = new SerialConfiguration(QString("AeroCore on %1").arg(portInfo.portName().trimmed()));
+                } else if (portInfo.description().contains("PX4")) {
+                    pSerial = new SerialConfiguration(QString("Pixhawk on %1").arg(portInfo.portName().trimmed()));
+                } else {
+                    continue;
+                }
                 pSerial->setDynamic(true);
                 pSerial->setPreferred(true);
                 pSerial->setBaud(115200);