diff --git a/src/comm/XbeeLink.cpp b/src/comm/XbeeLink.cpp
index 1b3a237e6e23e0a170cd7b7e1fe2a2789d404a6d..c83ae8bd16dfbafcb0275e87324f8046c3cacdb2 100644
--- a/src/comm/XbeeLink.cpp
+++ b/src/comm/XbeeLink.cpp
@@ -162,7 +162,6 @@ bool XbeeLink::hardwareConnect()
 	emit tryConnectEnd(true);
 	this->m_connected = true;
 	emit connected();
-	emit connected(true);
 	return true;
 }
 
@@ -185,7 +184,6 @@ bool XbeeLink::_disconnect(void)
 	this->m_connected = false;
 
 	emit disconnected();
-	emit connected(false);
 	return true;
 }
 
diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index aac445c9e51dd2a9f302349c9e37e56b26db7dde..22a2edb28c3ebc5511998b70c88318a9970b1ad7 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -273,7 +273,6 @@ void CommConfigurationWindow::setLinkType(qgc_link_t linktype)
 			{
 				XbeeLink *xbee = new XbeeLink();
 				tmpLink = xbee;
-				MainWindow::instance()->addLink(tmpLink);
 				break;
 			}
 #endif // QGC_XBEE_ENABLED