diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index fc0616a863..31450cc89a 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -104,7 +104,7 @@ config = dict(
 # Dynamically generate endpoint declarations from our wsgi app vars.
 # Eventually, replace *all* fedmsg endpoint definitions with this one loop
 {% for host in groups['all'] %}
-{% if 'wsgi_fedmsg_service' in hostvars[host] %}
+{% if 'wsgi_fedmsg_service' in hostvars[host] and env == hostvars[host]['env'] %}
         "{{hostvars[host]['wsgi_fedmsg_service']}}.{{host.split('.')|first}}": [
 {% for i in range(wsgi_procs * wsgi_threads) %}
             "tcp://{{host}}:30{{'%02d' % i}}",