diff --git a/src/main/scala/gitbucket/core/util/Notifier.scala b/src/main/scala/gitbucket/core/util/Notifier.scala
index 25318994d..438a4e12b 100644
--- a/src/main/scala/gitbucket/core/util/Notifier.scala
+++ b/src/main/scala/gitbucket/core/util/Notifier.scala
@@ -109,7 +109,9 @@ class Mailer(private val smtp: Smtp) extends Notifier {
     }
     smtp.ssl.foreach { ssl =>
       email.setSSLOnConnect(ssl)
-      email.setSslSmtpPort(smtp.port.get.toString)
+      if(ssl == true) {
+        email.setSslSmtpPort(smtp.port.get.toString)
+      }
     }
     smtp.fromAddress
       .map (_ -> smtp.fromName.getOrElse(context.loginAccount.get.userName))