diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index eb447dd1c..71b2a3586 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -886,7 +886,10 @@ void MainWindow::showFirstConnectedMessage()
 
   const auto isServer = m_coreProcess.mode() == CoreMode::Server;
   const auto closeToTray = Settings::value(Settings::Gui::CloseToTray).toBool();
-  messages::showFirstConnectedMessage(this, closeToTray, m_appConfig.enableService(), isServer);
+
+  using ProcessMode = Settings::ProcessMode;
+  const auto enableService = Settings::value(Settings::Core::ProcessMode).value<ProcessMode>() == ProcessMode::Service;
+  messages::showFirstConnectedMessage(this, closeToTray, enableService, isServer);
 }
 
 void MainWindow::updateStatus()
diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
index e275176a4..45ca8251e 100644
--- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
+++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
@@ -193,7 +193,6 @@ void SettingsDialog::loadFromConfig()
   ui->cbPreventSleep->setChecked(Settings::value(Settings::Core::PreventSleep).toBool());
   ui->cbLanguageSync->setChecked(Settings::value(Settings::Client::LanguageSync).toBool());
   ui->cbScrollDirection->setChecked(Settings::value(Settings::Client::InvertScrollDirection).toBool());
-  ui->cbServiceEnabled->setChecked(m_appConfig.enableService());
   ui->cbCloseToTray->setChecked(Settings::value(Settings::Gui::CloseToTray).toBool());
   ui->comboElevate->setCurrentIndex(static_cast<int>(m_appConfig.elevateMode()));
 
@@ -205,6 +204,9 @@ void SettingsDialog::loadFromConfig()
     ui->rbScopeUser->setChecked(true);
   }
 
+  const auto processMode = Settings::value(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
+  ui->cbServiceEnabled->setChecked(processMode == Settings::ProcessMode::Service);
+
   if (Settings::value(Settings::Gui::SymbolicTrayIcon).toBool())
     ui->rbIconMono->setChecked(true);
   else
diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp
index c4c144efc..63caa8ef8 100644
--- a/src/lib/gui/config/AppConfig.cpp
+++ b/src/lib/gui/config/AppConfig.cpp
@@ -68,7 +68,7 @@ const char *const AppConfig::m_SettingsName[] = {
     "", // 34 = kInvertConnection, obsolete
     "", // 35 = clientHostMode, obsolete
     "", // 36 = serverClientMode, obsolete
-    "enableService",
+    "", // 37 enable service moved to deskflow settings
     "", // 38 Moved to deskflow settings
     "", // 39 window size moved to deskflow settings
     "", // 40 window position moved to deskflow settings
@@ -111,7 +111,6 @@ void AppConfig::recallFromCurrentScope()
   m_ServerGroupChecked = getFromCurrentScope(kServerGroupChecked, m_ServerGroupChecked).toBool();
   m_UseInternalConfig = getFromCurrentScope(kUseInternalConfig, m_UseInternalConfig).toBool();
   m_ClientGroupChecked = getFromCurrentScope(kClientGroupChecked, m_ClientGroupChecked).toBool();
-  m_EnableService = getFromCurrentScope(kEnableService, m_EnableService).toBool();
 }
 
 void AppConfig::commit()
@@ -128,7 +127,6 @@ void AppConfig::commit()
     setInCurrentScope(kElevateMode, static_cast<int>(m_ElevateMode));
     setInCurrentScope(kElevateModeLegacy, m_ElevateMode == ElevateMode::kAlways);
     setInCurrentScope(kUseInternalConfig, m_UseInternalConfig);
-    setInCurrentScope(kEnableService, m_EnableService);
   }
 }
 
@@ -311,11 +309,6 @@ ElevateMode AppConfig::elevateMode() const
   return m_ElevateMode;
 }
 
-bool AppConfig::enableService() const
-{
-  return m_EnableService;
-}
-
 bool AppConfig::serverGroupChecked() const
 {
   return m_ServerGroupChecked;
@@ -359,11 +352,6 @@ void AppConfig::setElevateMode(ElevateMode em)
   m_ElevateMode = em;
 }
 
-void AppConfig::setEnableService(bool enabled)
-{
-  m_EnableService = enabled;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // End setters
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h
index 7578d9e00..cbe80b78c 100644
--- a/src/lib/gui/config/AppConfig.h
+++ b/src/lib/gui/config/AppConfig.h
@@ -82,7 +82,7 @@ private:
     // 34 = InvertConnection, obsolete
     // 35 = client-host-mode, obsolete
     // 36 = server-client-mode, obsolete
-    kEnableService = 37,
+    // kEnableService = 37, moved to deskflow settings
     // 38, close to tray moved to deskflow settings
     // 39 window size moved to deskflow settings
     // 40 window position moved to deskflow settings
@@ -118,7 +118,6 @@ public:
   ElevateMode elevateMode() const override;
   bool isActiveScopeWritable() const override;
   bool isActiveScopeSystem() const override;
-  bool enableService() const override;
   bool clientGroupChecked() const override;
 
   //
@@ -133,7 +132,6 @@ public:
   //
 
   void setElevateMode(ElevateMode em) override;
-  void setEnableService(bool enabled) override;
 
   //
   // Setters (new methods)
@@ -204,7 +202,6 @@ private:
   bool m_ServerGroupChecked = false;
   bool m_UseInternalConfig = false;
   bool m_ClientGroupChecked = false;
-  bool m_EnableService = false;
   bool m_LoadFromSystemScope = false;
 
   deskflow::gui::IConfigScopes &m_Scopes;
diff --git a/src/lib/gui/config/IAppConfig.h b/src/lib/gui/config/IAppConfig.h
index 38be78fbc..4482ec98c 100644
--- a/src/lib/gui/config/IAppConfig.h
+++ b/src/lib/gui/config/IAppConfig.h
@@ -27,7 +27,6 @@ public:
 
   virtual IConfigScopes &scopes() const = 0;
   virtual ElevateMode elevateMode() const = 0;
-  virtual bool enableService() const = 0;
   virtual bool isActiveScopeSystem() const = 0;
   virtual bool isActiveScopeWritable() const = 0;
   virtual bool clientGroupChecked() const = 0;
@@ -38,7 +37,6 @@ public:
 
   virtual void setLoadFromSystemScope(bool loadFromSystemScope) = 0;
   virtual void setElevateMode(ElevateMode elevateMode) = 0;
-  virtual void setEnableService(bool enableService) = 0;
 };
 
 } // namespace deskflow::gui
diff --git a/src/test/shared/gui/mocks/AppConfigMock.h b/src/test/shared/gui/mocks/AppConfigMock.h
index b1c9ba886..9f25a73e0 100644
--- a/src/test/shared/gui/mocks/AppConfigMock.h
+++ b/src/test/shared/gui/mocks/AppConfigMock.h
@@ -26,7 +26,6 @@ public:
 
   MOCK_METHOD(deskflow::gui::IConfigScopes &, scopes, (), (const, override));
   MOCK_METHOD(ElevateMode, elevateMode, (), (const, override));
-  MOCK_METHOD(bool, enableService, (), (const, override));
   MOCK_METHOD(bool, isActiveScopeSystem, (), (const, override));
   MOCK_METHOD(bool, isActiveScopeWritable, (), (const, override));
   MOCK_METHOD(bool, clientGroupChecked, (), (const, override));
@@ -37,7 +36,6 @@ public:
 
   MOCK_METHOD(void, setLoadFromSystemScope, (bool loadFromSystemScope), (override));
   MOCK_METHOD(void, setElevateMode, (ElevateMode elevateMode), (override));
-  MOCK_METHOD(void, setEnableService, (bool enableService), (override));
 
 private:
   const QString m_stub = "stub";