diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh
index 21c0d49a..c7ec502d 100755
--- a/setup/mail-postfix.sh
+++ b/setup/mail-postfix.sh
@@ -83,7 +83,8 @@ tools/editconf.py /etc/postfix/main.cf \
 # Guard against SMTP smuggling
 # This short-term workaround is recommended at https://www.postfix.org/smtp-smuggling.html
 tools/editconf.py /etc/postfix/main.cf \
-	smtpd_data_restrictions=reject_unauth_pipelining
+	smtpd_data_restrictions=reject_unauth_pipelining \
+	smtpd_discard_ehlo_keywords="chunking, silent-discard"
 
 # ### Outgoing Mail