diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index f704d28bf..bcf3b5e6c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -161,6 +161,12 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
                 $andWhereSearchClause[] = '('.implode(' OR ', $q).')';
                 $andWhereSearchClauseArgs = [...$andWhereSearchClauseArgs, ...$qArguments];
             }
+/*
+            if (null !== $phonenumber) {
+                $andWhereSearchClause[] =
+                    "person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR (EXISTS (SELECT 1 FROM chill_person_phone WHERE person.id = person_id AND phonenumber LIKE '%' || ? || '%'))";
+                array_push($andWhereSearchClauseArgs, $phonenumber, $phonenumber, $phonenumber);
+            } */
 
             $query->andWhereClause(
                 \implode(' AND ', $andWhereSearchClause),
@@ -208,13 +214,6 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
             );
         }
 
-        if (null !== $phonenumber) {
-            $query->andWhereClause(
-                "person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR pp.phonenumber LIKE '%' || ? || '%'",
-                [$phonenumber, $phonenumber, $phonenumber]
-            );
-            $query->setFromClause($query->getFromClause().' LEFT JOIN chill_person_phone pp ON pp.person_id = person.id');
-        }
 
         if (null !== $city) {
             $query->setFromClause($query->getFromClause().' '.