diff --git a/module/Core/src/Repository/TagRepository.php b/module/Core/src/Repository/TagRepository.php
index 3b3c5beb..71d291ef 100644
--- a/module/Core/src/Repository/TagRepository.php
+++ b/module/Core/src/Repository/TagRepository.php
@@ -31,13 +31,17 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
      */
     public function findTagsWithInfo(?Specification $spec = null): array
     {
-        $qb = $this->getQueryBuilder($spec, 't');
+        $qb = $this->createQueryBuilder('t');
         $qb->select('t AS tag', 'COUNT(DISTINCT s.id) AS shortUrlsCount', 'COUNT(DISTINCT v.id) AS visitsCount')
            ->leftJoin('t.shortUrls', 's')
            ->leftJoin('s.visits', 'v')
            ->groupBy('t')
            ->orderBy('t.name', 'ASC');
 
+        if ($spec !== null) {
+            $this->applySpecification($qb, $spec, 't');
+        }
+
         $query = $qb->getQuery();
 
         return map(