diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index fb9d670f7..b9d67f98d 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -160,7 +160,7 @@ class HelperFormCore extends Helper
 			'form_id' => $this->id,
 			'fields' => $this->fields_form,
 			'fields_value' => $this->fields_value,
-			'default_country' => (int)(Configuration::get('PS_SHOP_COUNTRY_ID') ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT')),
+			'default_country' => (int)$this->context->country->id,
 			'required_fields' => $this->getFieldsRequired(),
 			'vat_number' => file_exists(_PS_MODULE_DIR_.'vatnumber/ajax.php'),
 			'module_dir' => _MODULE_DIR_,