diff --git a/packages/ep_products/Classes/Middleware/ApiMiddleware.php b/packages/ep_products/Classes/Middleware/ApiMiddleware.php
index 1344d8a..c19bcb3 100644
--- a/packages/ep_products/Classes/Middleware/ApiMiddleware.php
+++ b/packages/ep_products/Classes/Middleware/ApiMiddleware.php
@@ -163,9 +163,9 @@ class ApiMiddleware implements MiddlewareInterface
             ->from('tx_epproducts_domain_model_product', 'product')
             ->leftJoin('product', 'tx_epproducts_domain_model_country', 'country', 'product.country = country.uid')
             ->leftJoin('product', 'tx_epproducts_domain_model_city', 'city', 'product.city = city.uid')
-            ->leftJoin('product', 'tx_epproducts_domain_model_matchcode', 'matchcode', 'product.uid = matchcode.entity AND matchcode.entity_type="hotel"')
             ->where($queryBuilder->expr()->eq('product.code', $queryBuilder->createNamedParameter($productCode)))
-            ->orWhere($queryBuilder->expr()->eq('matchcode.code', $queryBuilder->createNamedParameter($productCode)))->setMaxResults(1)->executeQuery()
+            ->orderBy('product.uid')
+            ->setMaxResults(1)->executeQuery()
             ->fetchAssociative()
         ;