diff --git a/Classes/Domain/Repository/NewsRepository.php b/Classes/Domain/Repository/NewsRepository.php
index 2509c88454cf4d5dbb380779702670fd91744007..68c4aacf01985883ab1c79aff6c641aa481a0d52 100644
--- a/Classes/Domain/Repository/NewsRepository.php
+++ b/Classes/Domain/Repository/NewsRepository.php
@@ -125,14 +125,18 @@ class NewsRepository extends AbstractRepository {
 					$tagConstraints[] = $query->contains('tags', $tagId);
 				}
 			}
-			if (count($tagConstraints) > 1) {
+			$tagContraintAmount = count($tagConstraints);
+			if ($tagContraintAmount > 1) {
 				$constraints[] = $query->logicalOr($tagConstraints);
-			} elseif (count($tagConstraints)) {
+			} elseif ($tagContraintAmount) {
 				$constraints[] = $tagConstraints[0];
 			}
 		}
 
-		return $query->matching($query->logicalAnd($constraints))->count();
+		if (count($constraints) > 1) {
+			$query->matching($query->logicalAnd($constraints));
+		}
+		return $query->count();
 	}
 
 	/**