diff --git a/templates/master.cf-el5.erb b/templates/master.cf-el5.erb
index 760041e..426354a 100644
--- a/templates/master.cf-el5.erb
+++ b/templates/master.cf-el5.erb
@@ -7,9 +7,11 @@
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
 smtp      inet  n       -       n       -       -       smtpd
+<% if @smtp_content_filter -%>
 <% @smtp_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
+<% end -%>
 <% if @submission -%>
 submission inet n       -       n       -       -       smtpd
   -o smtpd_enforce_tls=<%= @submission_smtpd_enforce_tls %>
@@ -21,10 +23,12 @@ smtps     inet  n       -       n       -       -       smtpd
   -o smtpd_tls_wrappermode=yes
   -o smtpd_sasl_auth_enable=yes
   -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-<% @smtp_content_filter.each do |content_filter| -%>
+<% if @smtps_content_filter -%>
+<% @smtps_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
 <% end -%>
+<% end -%>
 #628      inet  n       -       n       -       -       qmqpd
 pickup    fifo  n       -       n       60      1       pickup
 cleanup   unix  n       -       n       -       0       cleanup
diff --git a/templates/master.cf.erb b/templates/master.cf.erb
index 248face..01867a3 100644
--- a/templates/master.cf.erb
+++ b/templates/master.cf.erb
@@ -16,9 +16,11 @@ tlsproxy  unix  -       -       n       -       0       tlsproxy
 dnsblog   unix  -       -       n       -       0       dnsblog
 smtpd     pass  -       -       n       -       -       smtpd
 <% end -%>
+<% if @smtp_content_filter -%>
 <% @smtp_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
+<% end -%>
 <% if @submission -%>
 submission inet n       -       n       -       -       smtpd
   -o smtpd_tls_security_level=<%= @submission_smtpd_tls_security_level %>
@@ -32,10 +34,12 @@ smtps     inet  n       -       n       -       -       smtpd
   -o smtpd_sasl_auth_enable=<%= @smtps_smtpd_sasl_auth_enable %>
   -o smtpd_client_restrictions=<%= @smtps_smtpd_client_restrictions %>
   -o milter_macro_daemon_name=ORIGINATING
+<% if @smtps_content_filter -%>
 <% @smtps_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
 <% end -%>
+<% end -%>
 #628      inet  n       -       n       -       -       qmqpd
 pickup    fifo  n       -       n       60      1       pickup
 cleanup   unix  n       -       n       -       0       cleanup