diff --git a/server/src/main/java/password/pwm/svc/email/EmailServerUtil.java b/server/src/main/java/password/pwm/svc/email/EmailServerUtil.java
index 8373a402b2..b867503380 100644
--- a/server/src/main/java/password/pwm/svc/email/EmailServerUtil.java
+++ b/server/src/main/java/password/pwm/svc/email/EmailServerUtil.java
@@ -177,17 +177,11 @@ private static Properties makeJavaMailProps(
         try
         {
             final SmtpServerType smtpServerType = profile.readSettingAsEnum( PwmSetting.EMAIL_SERVER_TYPE, SmtpServerType.class );
-            if ( smtpServerType == SmtpServerType.SMTP )
-            {
-                return properties;
-            }
-
-            final MailSSLSocketFactory mailSSLSocketFactory = new MailSSLSocketFactory();
-            mailSSLSocketFactory.setTrustManagers( trustManager );
-            properties.put( "mail.smtp.ssl.socketFactory", mailSSLSocketFactory );
-
             if ( smtpServerType == SmtpServerType.SMTPS )
             {
+                final MailSSLSocketFactory mailSSLSocketFactory = new MailSSLSocketFactory();
+                mailSSLSocketFactory.setTrustManagers( trustManager );
+                properties.put( "mail.smtp.ssl.socketFactory", mailSSLSocketFactory );
                 properties.put( "mail.smtp.ssl.enable", true );
                 properties.put( "mail.smtp.ssl.checkserveridentity", true );
                 properties.put( "mail.smtp.socketFactory.fallback", false );