diff --git a/src/Api/Extensions/ContentExtension.php b/src/Api/Extensions/ContentExtension.php
index 4d0e206d6..a9334702f 100644
--- a/src/Api/Extensions/ContentExtension.php
+++ b/src/Api/Extensions/ContentExtension.php
@@ -58,16 +58,25 @@ private function filterUnpublishedViewlessContent(QueryBuilder $queryBuilder): v
     {
         $rootAlias = $queryBuilder->getRootAliases()[0];
         $queryBuilder->andWhere(sprintf('%s.status = :status', $rootAlias));
-        $queryBuilder->andWhere(sprintf('%s.contentType NOT IN (:cts)', $rootAlias));
         $queryBuilder->setParameter('status', Statuses::PUBLISHED);
-        $queryBuilder->setParameter('cts', $this->viewlessContentTypes);
+
+        //todo: Fix this when https://github.com/doctrine/orm/issues/3835 closed.
+        if (! empty($this->viewlessContentTypes)) {
+            $queryBuilder->andWhere(sprintf('%s.contentType NOT IN (:cts)', $rootAlias));
+            $queryBuilder->setParameter('cts', $this->viewlessContentTypes);
+        }
     }
 
     private function filterUnpublishedViewlessFields(QueryBuilder $queryBuilder): void
     {
         $rootAlias = $queryBuilder->getRootAliases()[0];
-        $queryBuilder->join($rootAlias . '.content', 'c', Join::WITH, 'c.status = :status AND c.contentType NOT IN (:cts)');
+        $queryBuilder->join($rootAlias . '.content', 'c', Join::WITH, 'c.status = :status');
         $queryBuilder->setParameter('status', Statuses::PUBLISHED);
-        $queryBuilder->setParameter('cts', $this->viewlessContentTypes);
+
+        //todo: Fix this when https://github.com/doctrine/orm/issues/3835 closed.
+        if (! empty($this->viewlessContentTypes)) {
+            $queryBuilder->andWhere('c.contentType NOT IN (:cts)');
+            $queryBuilder->setParameter('cts', $this->viewlessContentTypes);
+        }
     }
 }