diff --git a/classes/Product.php b/classes/Product.php
index fbd4e7845..9eed6ee14 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -4737,7 +4737,8 @@ class ProductCore extends ObjectModel
 			LEFT JOIN `'._DB_PREFIX_.'layered_indexable_attribute_lang_value` la
 				ON (la.`id_attribute` = a.`id_attribute` AND la.`id_lang` = '.(int)Context::getContext()->language->id.')
 			WHERE la.`url_name` IS NOT NULL AND la.`url_name` != \'\'
-			AND pa.`id_product` = '.(int)$id_product);
+			AND pa.`id_product` = '.(int)$id_product.'
+			AND pac.`id_product_attribute` = '.(int)$id_product_attribute);
 
 			if (!empty($nb_custom_values))
 			{
@@ -4780,6 +4781,7 @@ class ProductCore extends ObjectModel
 					ON (pac.`id_product_attribute` = pa.`id_product_attribute`)
 				'.Shop::addSqlAssociation('product_attribute', 'pa').'
 				WHERE pa.`id_product` = '.(int)$id_product.'
+				AND pac.id_product_attribute = '.(int)$id_product_attribute.'
 				AND a.`id_attribute` NOT IN('.implode(', ', $tab_id_attribute).')');
 				$result = array_merge($values_not_custom, $result);
 			}