diff --git a/classes/Country.php b/classes/Country.php
index 8d5724406..08cae2169 100644
--- a/classes/Country.php
+++ b/classes/Country.php
@@ -71,6 +71,7 @@ class CountryCore extends ObjectModel
 		'table' => 'country',
 		'primary' => 'id_country',
 		'multilang' => true,
+		'multishop' => true,
 		'fields' => array(
 			'id_zone' => 					array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'id_currency' => 				array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 4b8c8b83e..3588fe52b 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -195,7 +195,7 @@ abstract class ObjectModelCore
 				if ($id_lang)
 				{
 					$sql->leftJoin($this->def['table'].'_lang', 'b', 'a.'.$this->def['primary'].' = b.'.$this->def['primary'].' AND b.id_lang = '.(int)$id_lang);
-					if ($this->id_shop)
+					if ($this->id_shop && !empty($this->def['multilang_shop']))
 						$sql->where('b.id_shop = '.$this->id_shop);
 				}
 
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index b04dce4ca..47b105102 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -384,9 +384,6 @@ class AdminCountriesControllerCore extends AdminController
 				$tmp_addr_format->id_country = $id_country;
 			}
 
-			$object = new $this->className();
-			$this->updateAssoShop($object->id);
-
 			$tmp_addr_format->format = Tools::getValue('address_layout');
 
 			if (strlen($tmp_addr_format->format) > 0)