diff --git a/NAPS2.Escl.Server/CertificateHelper.cs b/NAPS2.Escl.Server/CertificateHelper.cs
index 2a96d34e3a..fa7d236ba5 100644
--- a/NAPS2.Escl.Server/CertificateHelper.cs
+++ b/NAPS2.Escl.Server/CertificateHelper.cs
@@ -27,6 +27,7 @@ static CertificateHelper()
     // See https://stackoverflow.com/a/65258808/2112909
     public static X509Certificate2? GenerateSelfSignedCertificate(ILogger logger)
     {
+        return null;
         try
         {
             if (CertificateRequestType == null)
diff --git a/NAPS2.Escl.Server/EsclServer.cs b/NAPS2.Escl.Server/EsclServer.cs
index 2f0816bb12..4fafd37f7b 100644
--- a/NAPS2.Escl.Server/EsclServer.cs
+++ b/NAPS2.Escl.Server/EsclServer.cs
@@ -67,7 +67,7 @@ public async Task Start()
         // Try to generate a self-signed certificate if the caller hasn't provided one
         if (!SecurityPolicy.HasFlag(EsclSecurityPolicy.ServerDisableHttps) && Certificate == null)
         {
-            // await Task.Run(() => Certificate = CertificateHelper.GenerateSelfSignedCertificate(Logger));
+            await Task.Run(() => Certificate = CertificateHelper.GenerateSelfSignedCertificate(Logger));
         }
         if (SecurityPolicy.HasFlag(EsclSecurityPolicy.ServerRequireHttps) && Certificate == null)
         {