diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 4eeea48..3afa3f8 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -160,6 +160,9 @@ bool LinkManager::createConnectedLink(SharedLinkConfigurationPtr& config, bool i
         _mavlinkProtocol->setVersion(_mavlinkProtocol->getCurrentVersion());
 
         if (!link->_connect()) {
+            link->_freeMavlinkChannel();
+            _rgLinks.removeAt(_rgLinks.indexOf(link));
+            config->setLink(nullptr);
             return false;
         }