diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index a0f607cf..2d6fd1b3 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -127,7 +127,14 @@ const QString &AppConfig::language() const { return m_Language; }
 
 bool AppConfig::startedBefore() const { return m_StartedBefore; }
 
-bool AppConfig::autoConfig() const { return m_AutoConfig; }
+bool AppConfig::autoConfig() const {
+#ifndef SYNERGY_ENTERPRISE
+    return m_AutoConfig;
+#else
+    // always disable auto config for enterprise edition.
+    return false;
+#endif
+}
 
 QString AppConfig::autoConfigServer() const { return m_AutoConfigServer; }
 
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 3813f1e4..d32341ef 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -179,10 +179,11 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
 
 #ifndef SYNERGY_ENTERPRISE
     updateZeroconfService();
-    updateAutoConfigWidgets();
 
     addZeroconfServer(m_AppConfig->autoConfigServer());
 #endif
+
+    updateAutoConfigWidgets();
 }
 
 MainWindow::~MainWindow()
@@ -1275,7 +1276,11 @@ void MainWindow::updateAutoConfigWidgets()
         m_pLabelAutoDetected->hide();
         m_pComboServerList->hide();
 
+#ifndef SYNERGY_ENTERPRISE
         m_pWidgetAutoConfig->show();
+#else
+        m_pWidgetAutoConfig->hide();
+#endif
     }
 }