diff --git a/cms/envs/production.py b/cms/envs/production.py
index cde0bbc9770964d93a631aadcc627fb172c5124e..263d4284bf13f59c224611d809e322e3e6c82da3 100644
--- a/cms/envs/production.py
+++ b/cms/envs/production.py
@@ -406,6 +406,11 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT,
                                             CELERY_BROKER_VHOST)
 BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False)
 
+BROKER_TRANSPORT_OPTIONS = {
+    'fanout_patterns': True,
+    'fanout_prefix': True,
+}
+
 # Message expiry time in seconds
 CELERY_EVENT_QUEUE_TTL = ENV_TOKENS.get('CELERY_EVENT_QUEUE_TTL', None)
 
diff --git a/lms/envs/production.py b/lms/envs/production.py
index d0b3e299d42d40f169ed2de656aab7698b66e7cb..a50e72ead063a74d26105cc63078af165ab53515 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -542,6 +542,11 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT,
                                             CELERY_BROKER_VHOST)
 BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False)
 
+BROKER_TRANSPORT_OPTIONS = {
+    'fanout_patterns': True,
+    'fanout_prefix': True,
+}
+
 # Block Structures
 
 # upload limits