diff --git a/files/httpd/headers.conf.j2 b/files/httpd/headers.conf.j2
index e5e830d36f..49b4fef015 100644
--- a/files/httpd/headers.conf.j2
+++ b/files/httpd/headers.conf.j2
@@ -1,3 +1,5 @@
 Header set AppTime "%D"
 PassEnv HOSTNAME
 Header set AppServer "{{ inventory_hostname }}"
+
+ErrorDocument 421 "You have hit an incorrect proxy for a Fedora Project website due to a bug in Firefox. Please refresh"
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf
index 4617957aba..7b66cabc36 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf
@@ -8,6 +8,5 @@ TimeOut 10800
 ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
 ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
 {% else %}
-ErrorDocument 421 "You have hit an incorrect proxy for koji due to a bug in Firefox. Please refresh"
 Redirect 421 /
 {% endif %}