diff --git a/ChangeLog b/ChangeLog
index 9103003bed..b0e006ccb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Bug fixes:
 - #6760 Synergy loses license when creating a System scope config
 - #6342 Updated copyright year in version to use build date
 - #6771 Added Ubuntu 16 to CI/CD
+- #6804 Synergy loses edition when creating a System scope config
 - #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg
 
 
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index f62afe0dff..d1040270c8 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -234,7 +234,6 @@ void AppConfig::loadSettings()
         m_ElevateMode        = static_cast<ElevateMode>(elevateMode.toInt());
     }
 
-    m_Edition                   = static_cast<Edition>(loadSetting(kEditionSetting, kUnregistered).toInt());
     m_ActivateEmail             = loadSetting(kActivateEmail, "").toString();
     m_CryptoEnabled             = loadSetting(kCryptoEnabled, true).toBool();
     m_AutoHide                  = loadSetting(kAutoHide, false).toBool();
@@ -258,6 +257,7 @@ void AppConfig::loadSettings()
 
     if (updateSerial) {
         m_Serialkey                 = loadSetting(kSerialKey, "").toString().trimmed();
+        m_Edition                   = static_cast<Edition>(loadSetting(kEditionSetting, kUnregistered).toInt());
     }
 
     //Set the default path of the TLS certificate file in the users DIR