diff --git a/src/Util/SmartPaginatorFactory.php b/src/Util/SmartPaginatorFactory.php
index 925d74f6b..277f6371a 100644
--- a/src/Util/SmartPaginatorFactory.php
+++ b/src/Util/SmartPaginatorFactory.php
@@ -63,7 +63,7 @@ public static function create(ProxyQueryInterface $proxyQuery, array $hints = []
         $hasHavingPart = null !== $queryBuilder->getDQLPart('having');
 
         // it is only safe to disable output walkers for really simple queries
-        if (!$hasHavingPart && !$hasJoins && $hasSingleIdentifierName) {
+        if (!$hasHavingPart && $hasSingleIdentifierName) {
             $paginator->setUseOutputWalkers(false);
         }
 
diff --git a/tests/Util/SmartPaginatorFactoryTest.php b/tests/Util/SmartPaginatorFactoryTest.php
index c99d38dda..555b01f56 100644
--- a/tests/Util/SmartPaginatorFactoryTest.php
+++ b/tests/Util/SmartPaginatorFactoryTest.php
@@ -119,7 +119,7 @@ public function getQueriesForOutputWalker(): iterable
                 ->createQueryBuilder()
                 ->from(Author::class, 'author')
                 ->leftJoin('author.books', 'book'),
-            null,
+            false,
         ];
 
         yield 'With joins and composite identifier' => [