diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php
index 9a10efbf7..b5515fa81 100644
--- a/classes/AttributeGroup.php
+++ b/classes/AttributeGroup.php
@@ -91,7 +91,6 @@ class AttributeGroupCore extends ObjectModel
 		$attribute_combinations = Db::getInstance()->executeS('
 			SELECT pac.`id_attribute`, pa.`id_product_attribute`
 			FROM `'._DB_PREFIX_.'product_attribute` pa
-			'.Shop::addSqlAssociation('product_attribute', 'pa').'
 			LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac
 				ON (pa.`id_product_attribute` = pac.`id_product_attribute`)
 		');
diff --git a/classes/Product.php b/classes/Product.php
index 184be94b1..37b40f87a 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -984,7 +984,6 @@ class ProductCore extends ObjectModel
 		$result = Db::getInstance()->executeS(
 			'SELECT pac.`id_attribute`, pac.`id_product_attribute`
 			FROM `'._DB_PREFIX_.'product_attribute` pa
-			'.Shop::addSqlAssociation('product_attribute', 'pa').'
 			LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.`id_product_attribute` = pa.`id_product_attribute`)
 			WHERE pa.`id_product` = '.(int)$this->id
 		);
@@ -1827,7 +1826,7 @@ class ProductCore extends ObjectModel
 		{
 			$sql->select('pa.id_product_attribute');
 			$sql->leftOuterJoin('product_attribute', 'pa', 'p.`id_product` = pa.`id_product`');
-			$sql->join(Shop::addSqlAssociation('product_attribute', 'pa'));
+			$sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
 			$sql->where('product_attribute_shop.default_on = 1');
 		}
 
@@ -1901,7 +1900,7 @@ class ProductCore extends ObjectModel
 					FROM `'._DB_PREFIX_.'product` p
 					'.Shop::addSqlAssociation('product', 'p').'
 					LEFT JOIN  `'._DB_PREFIX_.'product_attribute` pa ON (p.id_product = pa.id_product)
-					'.Shop::addSqlAssociation('product_attribute', 'pa').'
+					'.Shop::addSqlAssociation('product_attribute', 'pa', false).'
 					WHERE product_shop.`active` = 1
 						'.(($ids_product) ? $ids_product : '').'
 						AND p.`id_product` IN (
@@ -3070,7 +3069,7 @@ class ProductCore extends ObjectModel
 		if (Combination::isFeatureActive())
 		{
 			$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`');
-			$sql->join(Shop::addSqlAssociation('product_attribute', 'pa'));
+			$sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
 			$where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\'';
 		}
 		$sql->where($where);
@@ -3105,7 +3104,6 @@ class ProductCore extends ObjectModel
 		$result = Db::getInstance()->executeS('
 		SELECT *
 			FROM `'._DB_PREFIX_.'product_attribute` pa
-			'.Shop::addSqlAssociation('product_attribute', 'pa').'
 			WHERE pa.`id_product` = '.(int)$id_product_old
 		);
 
@@ -4400,7 +4398,6 @@ class ProductCore extends ObjectModel
 		return Db::getInstance()->executeS('
 		SELECT pa.id_product_attribute
 		FROM `'._DB_PREFIX_.'product_attribute` pa
-		'.Shop::addSqlAssociation('product_attribute', 'pa').'
 		WHERE pa.`id_product` = '.(int)$id_product);
 	}
 
diff --git a/classes/SpecificPriceRule.php b/classes/SpecificPriceRule.php
index 9d53fb311..9d0fb7cfe 100755
--- a/classes/SpecificPriceRule.php
+++ b/classes/SpecificPriceRule.php
@@ -222,7 +222,7 @@ class SpecificPriceRuleCore extends ObjectModel
 		{
 			$query->select('pa.id_product_attribute');
 			$query->leftJoin('product_attribute', 'pa', 'p.id_product = pa.id_product');
-			$query->join(Shop::addSqlAssociation('product_attribute', 'pa'));
+			$query->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
 			$query->leftJoin('product_attribute_combination', 'pac', 'pa.id_product_attribute = pac.id_product_attribute');
 			$query->groupBy('pa.id_product_attribute');
 		}
diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php
index bdb03b653..58f6efd6a 100644
--- a/classes/stock/StockManager.php
+++ b/classes/stock/StockManager.php
@@ -594,7 +594,7 @@ class StockManagerCore implements StockManagerInterface
 				LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = s.`id_product`)
 				'.Shop::addSqlAssociation('product', 'p').'
 				LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.`id_product` = pa.`id_product`)
-				'.Shop::addSqlAssociation('product_attribute', 'pa').'
+				'.Shop::addSqlAssociation('product_attribute', 'pa', false).'
 				WHERE sm.`sign` = -1
 				AND sm.`id_stock_mvt_reason` != '.Configuration::get('PS_STOCK_MVT_TRANSFER_FROM').'
 				AND TO_DAYS(NOW()) - TO_DAYS(sm.`date_add`) <= '.(int)$coverage.'
diff --git a/controllers/admin/AdminStockCoverController.php b/controllers/admin/AdminStockCoverController.php
index a11015997..cd95e5861 100644
--- a/controllers/admin/AdminStockCoverController.php
+++ b/controllers/admin/AdminStockCoverController.php
@@ -189,7 +189,7 @@ class AdminStockCoverControllerCore extends AdminController
 		// query
 		$this->_select = 'a.id_product as id, COUNT(pa.id_product_attribute) as variations, SUM(s.usable_quantity) as stock';
 		$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.id_product = a.id_product)
-						'.Shop::addSqlAssociation('product_attribute', 'pa').'
+						'.Shop::addSqlAssociation('product_attribute', 'pa', false).'
 						INNER JOIN `'._DB_PREFIX_.'stock` s ON (s.id_product = a.id_product)';
 
 		self::$currentIndex .= '&coverage_period='.(int)$this->getCurrentCoveragePeriod().'&warn_days='.(int)$this->getCurrentWarning();
diff --git a/modules/favoriteproducts/FavoriteProduct.php b/modules/favoriteproducts/FavoriteProduct.php
index 76aa2e2cd..eb2f14d77 100644
--- a/modules/favoriteproducts/FavoriteProduct.php
+++ b/modules/favoriteproducts/FavoriteProduct.php
@@ -67,7 +67,7 @@ class FavoriteProduct extends ObjectModel
 				AND pl.`id_lang` = '.(int)$id_lang
 				.Shop::addSqlRestrictionOnLang('pl').'
 			LEFT OUTER JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.`id_product` = pa.`id_product`)
-			'.Shop::addSqlAssociation('product_attribute', 'pa').'
+			'.Shop::addSqlAssociation('product_attribute', 'pa', false).'
 			LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
 			LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
 			WHERE product_shop.`active` = 1