diff --git a/BTCPayServer/Services/Mails/EmailSettings.cs b/BTCPayServer/Services/Mails/EmailSettings.cs
index 8596e6f03..d24fee3d4 100644
--- a/BTCPayServer/Services/Mails/EmailSettings.cs
+++ b/BTCPayServer/Services/Mails/EmailSettings.cs
@@ -75,10 +75,7 @@ namespace BTCPayServer.Services.Mails
                     client.ServerCertificateValidationCallback = (s, c, h, e) => true;
 #pragma warning restore CA5359 // Do Not Disable Certificate Validation
                 }
-                var sslOptions = MailKit.Security.SecureSocketOptions.Auto;
-                if (Port is int p && p == 25) // Workaround for https://github.com/jstedfast/MailKit/pull/1398
-                    sslOptions = MailKit.Security.SecureSocketOptions.None;
-                await client.ConnectAsync(Server, Port.Value, sslOptions, connectCancel.Token);
+                await client.ConnectAsync(Server, Port.Value, MailKit.Security.SecureSocketOptions.Auto, connectCancel.Token);
                 if ((client.Capabilities & SmtpCapabilities.Authentication) != 0)
                     await client.AuthenticateAsync(Login ?? string.Empty, Password ?? string.Empty, connectCancel.Token);
             }