diff --git a/CHANGES.md b/CHANGES.md
index 5ebcda0d8..09c8cb0b4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
 ### :bug: Bugs fixed
 
 - User switch language to "zh_hant" will get 400 [Github #4884](https://github.com/penpot/penpot/issues/4884)
+- Smtp config ignoring port if ssl is set [Github #4872](https://github.com/penpot/penpot/issues/4872)
 
 ## 2.1.1
 
diff --git a/backend/src/app/email.clj b/backend/src/app/email.clj
index 2b1eb4c12..acb322805 100644
--- a/backend/src/app/email.clj
+++ b/backend/src/app/email.clj
@@ -306,6 +306,8 @@
       (let [session (create-smtp-session cfg)]
         (with-open [transport (.getTransport session (if (::ssl cfg) "smtps" "smtp"))]
           (.connect ^Transport transport
+                    ^String (::host cfg)
+                    ^String (::port cfg)
                     ^String (::username cfg)
                     ^String (::password cfg))