diff --git a/awx/main/middleware.py b/awx/main/middleware.py
index 4906bfea26..87959af432 100644
--- a/awx/main/middleware.py
+++ b/awx/main/middleware.py
@@ -39,11 +39,12 @@ class ActivityStreamMiddleware(object):
         return response
 
     def set_actor(self, user, sender, instance, **kwargs):
-        if sender == ActivityStream:
-            if isinstance(user, User) and instance.user is None:
-                instance.user = user
-            elif not self.finished:
-                self.isActivityStreamEvent = True
-                self.instances.append(instance)
-        else:
+        if not self.finished:
+            if sender == ActivityStream:
+                if isinstance(user, User) and instance.user is None:
+                    instance.user = user
+                else:
+                    self.isActivityStreamEvent = True
+                    self.instances.append(instance)
+            else:
                 self.isActivityStreamEvent = False