diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7243ecf6..9ce3eaf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * Repair keepalived role
 * generate-ldif: Correct generated entries for php-fpm in containers
 * redis: Remount /usr with RW before adding nagios plugin
+* postfix: Do not send mails through milters a second time after amavis (in packmail)
 
 ### Removed
 
diff --git a/postfix/templates/packmail_master.cf.j2 b/postfix/templates/packmail_master.cf.j2
index 50aeeec4..9627fcb3 100644
--- a/postfix/templates/packmail_master.cf.j2
+++ b/postfix/templates/packmail_master.cf.j2
@@ -158,7 +158,7 @@ smtp-amavis unix -  -   y -   2  lmtp
     -o smtpd_hard_error_limit=1000
     -o smtpd_client_connection_count_limit=0
     -o smtpd_client_connection_rate_limit=0
-    -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks
+    -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_milters
 
 pre-cleanup          unix      n      -      n      -      0      cleanup
     -o virtual_alias_maps=