diff --git a/awx/main/queue.py b/awx/main/queue.py
index bfb487441f..b4c0fb2b7d 100644
--- a/awx/main/queue.py
+++ b/awx/main/queue.py
@@ -48,7 +48,7 @@ class FifoQueue(object):
 class CallbackQueueDispatcher(object):
 
     def __init__(self):
-        self.callback_connection = getattr(settings, 'CALLBACK_CONNECTION', None)
+        self.callback_connection = getattr(settings, 'BROKER_URL', None)
         self.connection_queue = getattr(settings, 'CALLBACK_QUEUE', '')
         self.connection = None
         self.exchange = None
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 69cd7f232b..6149901e53 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -796,6 +796,7 @@ ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC = False
 # Internal API URL for use by inventory scripts and callback plugin.
 INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT
 
+USE_CALLBACK_QUEUE = True
 CALLBACK_QUEUE = "callback_tasks"
 SCHEDULER_QUEUE = "scheduler"