diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index d436f683248a7199b67b1fb290b69720287ca6d9..baa84cfbe60ea58e9cee7475775ae22e853f7b76 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -439,6 +439,9 @@ bool QGCApplication::_initForNormalAppBoot(void)
                     "Your saved settings have been reset to defaults.");
     }
 
+    // Connect links with flag AutoconnectLink
+    toolbox()->linkManager()->startAutoConnectedLinks();
+
     if (getQGCMapEngine()->wasCacheReset()) {
         showMessage("The Offline Map Cache database has been upgraded. "
                     "Your old map cache sets have been reset.");
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 68d31c11faa248b0476a1f68808e409b7a4aa7fd..09233d44cc2641811c64301d9f93ed2344029c83 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -990,3 +990,14 @@ QList<LinkInterface*> LinkManager::links(void)
 
     return rawLinks;
 }
+
+void LinkManager::startAutoConnectedLinks(void)
+{
+    SharedLinkConfigurationPointer conf;
+
+    for(int i = 0; i < _sharedConfigurations.count(); i++) {
+        conf = _sharedConfigurations[i];
+        if (conf->isAutoConnect())
+            createConnectedLink(conf);
+    }
+}
diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h
index 9383c38a0e11d727ab5ddca3fbbaf24b9a17eb65..8a2031b864f71d3def1e0d606272c4889c17b173 100644
--- a/src/comm/LinkManager.h
+++ b/src/comm/LinkManager.h
@@ -171,6 +171,8 @@ public:
 
     SharedLinkConfigurationPointer addConfiguration(LinkConfiguration* config);
 
+    void startAutoConnectedLinks(void);
+
 signals:
     void autoconnectUDPChanged        (bool autoconnect);
     void autoconnectPixhawkChanged    (bool autoconnect);