diff --git a/awx/main/utils/ha.py b/awx/main/utils/ha.py
index 91b9a0c05b..49421ad4cb 100644
--- a/awx/main/utils/ha.py
+++ b/awx/main/utils/ha.py
@@ -25,10 +25,11 @@ def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, w
 
     bcast_queue_names = set([construct_bcast_queue_name(n) for n in settings.AWX_CELERY_BCAST_QUEUES_STATIC])
     all_queue_names = ig_names | hostnames | set(settings.AWX_CELERY_QUEUES_STATIC)
+    desired_queues = bcast_queue_names | (all_queue_names if instance.enabled else set())
 
-    # Remove queues that aren't in the instance group
+    # Remove queues
     for queue_name in worker_queue_names:
-        if queue_name not in all_queue_names | bcast_queue_names or not instance.enabled:
+        if queue_name not in desired_queues:
             app.control.cancel_consumer(queue_name.encode("utf8"), reply=True, destination=[worker_name])
             removed_queues.append(queue_name.encode("utf8"))