diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index b11545ff..f9243e8f 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -820,6 +820,7 @@ void MainWindow::updateZeroconfService()
 void MainWindow::serverDetected(const QString name)
 {
 	if (m_pComboServerList->findText(name) == -1) {
+		// Note: the first added item triggers startSynergy
 		m_pComboServerList->addItem(name);
 	}
 }
diff --git a/src/gui/src/ZeroconfService.cpp b/src/gui/src/ZeroconfService.cpp
index fec08447..0c1ea9cc 100644
--- a/src/gui/src/ZeroconfService.cpp
+++ b/src/gui/src/ZeroconfService.cpp
@@ -90,10 +90,6 @@ void ZeroconfService::clientDetected(const QList<ZeroconfRecord>& list)
 			record.serviceName));
 		m_pMainWindow->autoAddScreen(record.serviceName);
 	}
-
-	if (!list.isEmpty()) {
-		m_pMainWindow->startSynergy();
-	}
 }
 
 void ZeroconfService::errorHandle(DNSServiceErrorType errorCode)