diff --git a/config/config.inc.php b/config/config.inc.php
index 0fc8e8dd0..49594c787 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -88,6 +88,7 @@ if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST']))
 
 /* Initialize the current Shop */
 Context::getContext()->shop = Shop::initialize();
+Shop::setContext(Shop::CONTEXT_SHOP, Context::getContext()->shop->id);
 define('_THEME_NAME_', Context::getContext()->shop->getTheme());
 define('__PS_BASE_URI__', Context::getContext()->shop->getBaseURI());
 
diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index 863d41d91..7000f0646 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -62,6 +62,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		global $smarty;
 
 		Context::getContext()->shop = new Shop(1);
+		Shop::setContext(Shop::CONTEXT_SHOP, 1);
 		Configuration::loadConfiguration();
 		Context::getContext()->language = new Language(Configuration::get('PS_LANG_DEFAULT'));
 		Context::getContext()->country = new Country('PS_COUNTRY_DEFAULT');