diff --git a/ChangeLog b/ChangeLog
index 1168e4460..a91fd115c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Bug fixes:
 - #6831 Incorporating Sonar's major
 - #6837 Memory leaks on macOS system
 - #6838 Enterprise asks for serial key on Linux system
+- #6846 TLS certificate is not created by default for Synergy Enterprise.
 
 Enhancements:
 - #6836 Enabling Github Code Scanning
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index bf646aa7c..1eae3dcfe 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -269,6 +269,10 @@ void AppConfig::loadSettings()
     m_TLSCertificatePath        = loadSetting(kTLSCertPath, certificateFilename).toString();
     m_TLSKeyLength              = loadSetting(kTLSKeyLength, "2048").toString();
 
+    if (getCryptoEnabled()) {
+        generateCertificate();
+    }
+
 }
 
 void AppConfig::saveSettings()