diff --git a/roles/penpot/templates/docker-compose.yml b/roles/penpot/templates/docker-compose.yml
index 8d1657cfa2842a1efb29de6f9049196a39913645..9d62d9b2c0c8e564a8e39d775b486edd4cd62065 100644
--- a/roles/penpot/templates/docker-compose.yml
+++ b/roles/penpot/templates/docker-compose.yml
@@ -72,7 +72,7 @@ services:
       # Should be set to the public domain when penpot is going to be
       # served.
       - PENPOT_PUBLIC_URI=https://{{ penpot_domain }}
-      - PENPOT_FLAGS={% if penpot_registration_enabled %}enable{% else %}disable{% endif %}-registration disable-demo-users disable-login-with-ldap disable-smtp
+      - PENPOT_FLAGS={% if penpot_registration_enabled %}enable{% else %}disable{% endif %}-registration disable-demo-users disable-login-with-ldap {% if penpot_smtp is defined and penpot_smtp.enabled %}enable{% else %}disable{% endif %}-smtp
 
       # comma-separated domains, defaults to `""` which means that all domains are allowed)
       - PENPOT_REGISTRATION_DOMAIN_WHITELIST=""
@@ -112,7 +112,6 @@ services:
       # console, but for production usage is recommeded to setup a
       # real SMTP provider. Emails are used for confirm user
       # registration.
-      - PENPOT_SMTP_ENABLED={{ penpot_smtp.enabled | lower }}
       - PENPOT_SMTP_DEFAULT_FROM={{ penpot_smtp.from }}
       - PENPOT_SMTP_DEFAULT_REPLY_TO={{ penpot_smtp.reply_to }}
       - PENPOT_SMTP_HOST={{ penpot_smtp.host }}