diff --git a/confd/templates/setup_main.tmpl b/confd/templates/setup_main.tmpl
index 34b637c..ae36d9b 100644
--- a/confd/templates/setup_main.tmpl
+++ b/confd/templates/setup_main.tmpl
@@ -67,4 +67,3 @@ postconf -F spamfilter/unix/private=- \
          spamfilter/unix/wakeup=- \
          spamfilter/unix/process_limit=- \
          spamfilter/unix/command='pipe flags=Rq user=vmail argv=/usr/local/bin/spamfilter -oi -f ${sender} ${recipient}'
-postconf -P smtpd/pass/content_filter=spamfilter
diff --git a/confd/templates/setup_postscreen.tmpl b/confd/templates/setup_postscreen.tmpl
index 1445170..1fc9c13 100644
--- a/confd/templates/setup_postscreen.tmpl
+++ b/confd/templates/setup_postscreen.tmpl
@@ -52,6 +52,10 @@ postconf -F dnsblog/unix/private=- \
 	 dnsblog/unix/process_limit=0 \
 	 dnsblog/unix/command="dnsblog"
 
+
+postconf -P smtpd/pass/content_filter=spamfilter
+
+
 # FIXME: template tables instead of creating empty files
 touch /etc/postfix/rules/postscreen_access_list.cidr
 touch /etc/postfix/rules/postscreen_dnsbl_mask.pcre
@@ -77,6 +81,7 @@ postconf -F smtp/inet/private=n \
          smtp/inet/wakeup=- \
 	 smtp/inet/process_limit=- \
 	 smtp/inet/command="smtpd"
+postconf -P smtp/inet/content_filter=spamfilter
 postconf -M# dnsblog/unix
 
 {{ end }}