diff --git a/components/Tag/Tag.php b/components/Tag/Tag.php
index c5a5fddec0..2e44221a65 100644
--- a/components/Tag/Tag.php
+++ b/components/Tag/Tag.php
@@ -213,8 +213,9 @@ class Tag extends Component
                 $actor_expr = $temp_actor_expr;
                 return Event::next;
             }
+            return Event::stop;
         }
-        return Event::stop;
+        return Event::next;
     }
 
     public function onCollectionQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool