diff --git a/awx/main/models/__init__.py b/awx/main/models/__init__.py
index 29b64a0758..f439a692fb 100644
--- a/awx/main/models/__init__.py
+++ b/awx/main/models/__init__.py
@@ -202,6 +202,7 @@ activity_stream_registrar.connect(Inventory)
 activity_stream_registrar.connect(Host)
 activity_stream_registrar.connect(Group)
 activity_stream_registrar.connect(Instance)
+activity_stream_registrar.connect(InstanceGroup)
 activity_stream_registrar.connect(InventorySource)
 # activity_stream_registrar.connect(InventoryUpdate)
 activity_stream_registrar.connect(Credential)
diff --git a/awx/main/signals.py b/awx/main/signals.py
index d8931dc266..3cc57abb6a 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -676,9 +676,3 @@ def create_access_token_user_if_missing(sender, **kwargs):
         post_save.disconnect(create_access_token_user_if_missing, sender=OAuth2AccessToken)
         obj.save()
         post_save.connect(create_access_token_user_if_missing, sender=OAuth2AccessToken)
-
-
-# Connect the Instance Group to Activity Stream receivers.
-post_save.connect(activity_stream_create, sender=InstanceGroup, dispatch_uid=str(InstanceGroup) + "_create")
-pre_save.connect(activity_stream_update, sender=InstanceGroup, dispatch_uid=str(InstanceGroup) + "_update")
-pre_delete.connect(activity_stream_delete, sender=InstanceGroup, dispatch_uid=str(InstanceGroup) + "_delete")
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 9e933f17ba..90b5672241 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -191,6 +191,8 @@ def inform_cluster_of_shutdown():
 
 @task(queue=get_local_queuename)
 def apply_cluster_membership_policies():
+    from awx.main.signals import disable_activity_stream
+
     started_waiting = time.time()
     with advisory_lock('cluster_policy_lock', wait=True):
         lock_time = time.time() - started_waiting
@@ -282,21 +284,19 @@ def apply_cluster_membership_policies():
 
         # On a differential basis, apply instances to groups
         with transaction.atomic():
-            for g in actual_groups:
-                if g.obj.is_container_group:
-                    logger.debug('Skipping containerized group {} for policy calculation'.format(g.obj.name))
-                    continue
-                instances_to_add = set(g.instances) - set(g.prior_instances)
-                instances_to_remove = set(g.prior_instances) - set(g.instances)
-                # The following writes to the db don't spam the activity stream, because
-                # InstanceGroup is special-cased in signals.py to connect to only the non-m2m
-                # signal handlers.
-                if instances_to_add:
-                    logger.debug('Adding instances {} to group {}'.format(list(instances_to_add), g.obj.name))
-                    g.obj.instances.add(*instances_to_add)
-                if instances_to_remove:
-                    logger.debug('Removing instances {} from group {}'.format(list(instances_to_remove), g.obj.name))
-                    g.obj.instances.remove(*instances_to_remove)
+            with disable_activity_stream():
+                for g in actual_groups:
+                    if g.obj.is_container_group:
+                        logger.debug('Skipping containerized group {} for policy calculation'.format(g.obj.name))
+                        continue
+                    instances_to_add = set(g.instances) - set(g.prior_instances)
+                    instances_to_remove = set(g.prior_instances) - set(g.instances)
+                    if instances_to_add:
+                        logger.debug('Adding instances {} to group {}'.format(list(instances_to_add), g.obj.name))
+                        g.obj.instances.add(*instances_to_add)
+                    if instances_to_remove:
+                        logger.debug('Removing instances {} from group {}'.format(list(instances_to_remove), g.obj.name))
+                        g.obj.instances.remove(*instances_to_remove)
         logger.debug('Cluster policy computation finished in {} seconds'.format(time.time() - started_compute))