diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 972dcb8eed5fa1dbdc3132649feda15de2f9ff14..914e30d4d25b95fe3f315eb4b0ad4254299df459 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -619,7 +619,7 @@ void QGCApplication::reconnectAfterWait(int waitSeconds)
     LinkInterface* link = linkManager->getLinks()[0];
     
     // Save the link configuration so we can restart the link laster
-    _reconnectLinkConfig = linkManager->getLinks()[0]->getLinkConfiguration();
+    _reconnectLinkConfig = LinkConfiguration::duplicateSettings(linkManager->getLinks()[0]->getLinkConfiguration());
     
     // Disconnect and wait
     
@@ -629,6 +629,9 @@ void QGCApplication::reconnectAfterWait(int waitSeconds)
 
 void QGCApplication::_reconnect(void)
 {
+    Q_ASSERT(_reconnectLinkConfig);
+    
     qgcApp()->restoreOverrideCursor();
     LinkManager::instance()->createConnectedLink(_reconnectLinkConfig);
+    _reconnectLinkConfig = NULL;
 }