diff --git a/lib/galaxy/queues.py b/lib/galaxy/queues.py
index abb9b993027..5b74c0e496d 100644
--- a/lib/galaxy/queues.py
+++ b/lib/galaxy/queues.py
@@ -32,7 +32,7 @@ def control_queues_from_config(config):
     """
     hostname = socket.gethostname()
     process_name = "{server_name}@{hostname}".format(server_name=config.server_name, hostname=hostname)
-    exchange_queue = Queue("control.%s" % process_name, galaxy_exchange, routing_key='control.%s' % process_name)
+    exchange_queue = Queue("control.%s" % process_name, galaxy_exchange, routing_key='control.*')
     non_exchange_queue = Queue("control.%s" % process_name, routing_key='control.%s' % process_name)
     return exchange_queue, non_exchange_queue