diff --git a/classes/Customer.php b/classes/Customer.php
index a3f28a894..ef5cd2ffe 100644
--- a/classes/Customer.php
+++ b/classes/Customer.php
@@ -426,6 +426,7 @@ class CustomerCore extends ObjectModel
 				LEFT JOIN `'._DB_PREFIX_.'country` c ON (a.`id_country` = c.`id_country`)
 				LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`)
 				LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = a.`id_state`)
+				'.(Context::getContext()->shop->getGroup()->share_order ? '' : Shop::addSqlAssociation('country', 'c')).' 
 				WHERE `id_lang` = '.(int)$id_lang.' AND `id_customer` = '.(int)$this->id.' AND a.`deleted` = 0';
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 	}