diff --git a/extensions/tags/src/Listener/FilterDiscussionListByTags.php b/extensions/tags/src/Listener/FilterDiscussionListByTags.php
index b4b5cdf63..6f3ac172e 100755
--- a/extensions/tags/src/Listener/FilterDiscussionListByTags.php
+++ b/extensions/tags/src/Listener/FilterDiscussionListByTags.php
@@ -44,10 +44,8 @@ class FilterDiscussionListByTags
     {
         $query = $event->search->getQuery();
 
-        foreach ($event->search->getActiveGambits() as $gambit) {
-            if ($gambit instanceof TagGambit || $gambit instanceof SubscriptionGambit) {
-                return;
-            }
+        if (count($event->search->getActiveGambits()) > 0) {
+            return;
         }
 
         $query->whereNotExists(function ($query) {