diff --git a/emailwiz.sh b/emailwiz.sh
index ce8e1f5..c7d952f 100644
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -308,6 +308,10 @@ postconf -e 'smtpd_milters = inet:localhost:12301'
 postconf -e 'non_smtpd_milters = inet:localhost:12301'
 postconf -e 'mailbox_command = /usr/lib/dovecot/deliver'
 
+# Short-term workaround to prevent SMTP smuggling
+postconf -e 'smtpd_forbid_unauth_pipelining = yes'
+postconf -e 'smtpd_discard_ehlo_keywords = chunking'
+
 # A fix for "Opendkim won't start: can't open PID file?", as specified here: https://serverfault.com/a/847442
 /lib/opendkim/opendkim.service.generate
 systemctl daemon-reload