diff --git a/lib/Query/Common/CriterionVisitor/CompositeCriterion.php b/lib/Query/Common/CriterionVisitor/CompositeCriterion.php
new file mode 100644
index 000000000..f3095a8a0
--- /dev/null
+++ b/lib/Query/Common/CriterionVisitor/CompositeCriterion.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace EzSystems\EzPlatformSolrSearchEngine\Query\Common\CriterionVisitor;
+
+use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
+use EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor;
+
+class CompositeCriterion extends CriterionVisitor
+{
+    public function canVisit(Criterion $criterion): bool
+    {
+        return $criterion instanceof Criterion\CompositeCriterion;
+    }
+
+    public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
+    {
+        return $subVisitor->visit($criterion->criteria, $subVisitor);
+    }
+}
diff --git a/lib/Resources/config/container/solr/criterion_visitors.yml b/lib/Resources/config/container/solr/criterion_visitors.yml
index e46e39cb7..e2e15830b 100644
--- a/lib/Resources/config/container/solr/criterion_visitors.yml
+++ b/lib/Resources/config/container/solr/criterion_visitors.yml
@@ -355,3 +355,8 @@ services:
 
     EzSystems\EzPlatformSolrSearchEngine\Query\Location\CriterionVisitor\Factory\LocationFullTextFactory:
         parent: EzSystems\EzPlatformSolrSearchEngine\Query\Common\CriterionVisitor\Factory\FullTextFactoryAbstract
+
+    EzSystems\EzPlatformSolrSearchEngine\Query\Common\CriterionVisitor\CompositeCriterion:
+        tags:
+            - {name: ezpublish.search.solr.query.content.criterion_visitor}
+            - {name: ezpublish.search.solr.query.location.criterion_visitor}