diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1700606fb09..b449c4a1c26 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1010,6 +1010,11 @@ class Societe extends CommonObject
 			$this->fk_multicurrency = 0;
 		}
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		dol_syslog(get_class($this)."::create ".$this->name);
 
 		$now = dol_now();