diff --git a/.changes/unreleased/Fixed-20230713-102640.yaml b/.changes/unreleased/Fixed-20230713-102640.yaml
new file mode 100644
index 000000000..e731e5252
--- /dev/null
+++ b/.changes/unreleased/Fixed-20230713-102640.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: |
+  Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
+time: 2023-07-13T10:26:40.503796155+02:00
+custom:
+  Issue: "126"
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index 86c0fa9db..1d4e12074 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -71,12 +71,9 @@ class ThirdPartyApiSearch implements SearchApiInterface
             ->setSelectKey('tparty')
             ->setSelectJsonbMetadata("jsonb_build_object('id', tparty.id)")
             ->setFromClause('chill_3party.third_party AS tparty
-                LEFT JOIN chill_main_address cma ON cma.id = tparty.address_id
-                LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
                 LEFT JOIN chill_3party.third_party AS parent ON tparty.parent_id = parent.id
-                LEFT JOIN chill_main_address cma_p ON parent.address_id = cma_p.id
-                LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc.id')
-            ->andWhereClause('tparty.active IS TRUE');
+                LEFT JOIN chill_main_address cma ON cma.id = COALESCE(parent.address_id, tparty.address_id)
+                LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id');
 
         $strs = explode(' ', $pattern);
         $wheres = [];
@@ -102,9 +99,8 @@ class ThirdPartyApiSearch implements SearchApiInterface
                         (parent.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int
                     ) + " .
                    // take postcode label into account, but lower than the canonicalized field
-                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0) + " .
-                   "COALESCE((LOWER(UNACCENT(cmpc_p.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
-                $pertinenceArgs[] = [$str, $str, $str, $str, $str, $str];
+                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
+                $pertinenceArgs[] = [$str, $str, $str, $str, $str];
             }
         }