diff --git a/data/conf/postfix/master.cf b/data/conf/postfix/master.cf
index a8bb0abfd..4917c17b7 100644
--- a/data/conf/postfix/master.cf
+++ b/data/conf/postfix/master.cf
@@ -17,7 +17,6 @@ smtps    inet  n       -       n       -       -       smtpd
   -o tls_preempt_cipherlist=yes
   -o cleanup_service_name=smtp_sender_cleanup
   -o syslog_name=postfix/smtps
-  -o smtpd_end_of_data_restrictions=$smtpd_last_auth
 10465    inet  n       -       n       -       -       smtpd
   -o smtpd_upstream_proxy_protocol=haproxy
   -o smtpd_tls_wrappermode=yes
@@ -26,7 +25,6 @@ smtps    inet  n       -       n       -       -       smtpd
   -o tls_preempt_cipherlist=yes
   -o cleanup_service_name=smtp_sender_cleanup
   -o syslog_name=postfix/smtps-haproxy
-  -o smtpd_end_of_data_restrictions=$smtpd_last_auth
 
 # smtpd with starttls on 587/tcp
 # TLS protocol can be modified by setting submission_smtpd_tls_mandatory_protocols in extra.cf
@@ -38,7 +36,6 @@ submission inet n       -       n       -       -       smtpd
   -o tls_preempt_cipherlist=yes
   -o cleanup_service_name=smtp_sender_cleanup
   -o syslog_name=postfix/submission
-  -o smtpd_end_of_data_restrictions=$smtpd_last_auth
 10587      inet n       -       n       -       -       smtpd
   -o smtpd_upstream_proxy_protocol=haproxy
   -o smtpd_client_restrictions=permit_mynetworks,permit_sasl_authenticated,reject
@@ -48,7 +45,6 @@ submission inet n       -       n       -       -       smtpd
   -o tls_preempt_cipherlist=yes
   -o cleanup_service_name=smtp_sender_cleanup
   -o syslog_name=postfix/submission-haproxy
-  -o smtpd_end_of_data_restrictions=$smtpd_last_auth
 
 # used by SOGo
 # smtpd_sender_restrictions should match main.cf, but with check_sasl_access prepended for login-as-mailbox-user function
@@ -58,7 +54,6 @@ submission inet n       -       n       -       -       smtpd
   -o smtpd_sender_restrictions=check_sasl_access,regexp:/opt/postfix/conf/allow_mailcow_local.regexp,reject_authenticated_sender_login_mismatch,permit_mynetworks,permit_sasl_authenticated,reject_unlisted_sender,reject_unknown_sender_domain
   -o cleanup_service_name=smtp_sender_cleanup
   -o syslog_name=postfix/sogo
-  -o smtpd_end_of_data_restrictions=$smtpd_last_auth
 
 # used to reinject quarantine mails
 590 inet n      -       n       -       -       smtpd
@@ -68,7 +63,6 @@ submission inet n       -       n       -       -       smtpd
   -o smtpd_milters=
   -o non_smtpd_milters=
   -o syslog_name=postfix/quarantine
-  -o smtpd_end_of_data_restrictions=$smtpd_last_auth
 
 # used to send bcc mails
 591 inet n      -       n       -       -       smtpd