diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index aab44872..8545da30 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -95,13 +95,8 @@ smtpd_delay_reject = yes
 # Allowed senders are: the user or one of the alias destinations
 smtpd_sender_login_maps = $virtual_alias_maps
 
-# Helo restrictions
+# Helo restrictions are specified for smtp only in master.cf
 smtpd_helo_required = yes
-smtpd_helo_restrictions =
-   permit_mynetworks,
-   reject_non_fqdn_helo_hostname,
-   reject_invalid_helo_hostname,
-   permit
 
 # Sender restrictions
 smtpd_sender_restrictions =
diff --git a/postfix/conf/master.cf b/postfix/conf/master.cf
index 8e316a44..8658c155 100644
--- a/postfix/conf/master.cf
+++ b/postfix/conf/master.cf
@@ -3,6 +3,7 @@
 
 # Exposed SMTP services
 smtp      inet  n       -       n       -       -       smtpd
+  -o smtpd_sender_restrictions=permit_mynetworks,reject_non_fqdn_helo_hostname,reject_invalid_helo_hostname,permit
 submission inet n       -       n       -       -       smtpd
   -o smtpd_tls_security_level=encrypt
   -o smtpd_sasl_auth_enable=yes