diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 0648118dd..0b09fa31d 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -352,7 +352,10 @@ class ShopCore extends ObjectModel
 		if ((!$id_shop && defined('_PS_ADMIN_DIR_')) || Tools::isPHPCLI())
 		{
 			// If in admin, we can access to the shop without right URL
-			$shop = new Shop((int)Configuration::get('PS_SHOP_DEFAULT'));
+			if (!$id_shop)
+				$id_shop = (int)Configuration::get('PS_SHOP_DEFAULT');
+
+			$shop = new Shop((int)$id_shop);
 			$shop->physical_uri = preg_replace('#/+#', '/', str_replace('\\', '/', dirname(dirname($_SERVER['SCRIPT_NAME']))).'/');
 			$shop->virtual_uri = '';
 			
@@ -1130,4 +1133,4 @@ class ShopCore extends ObjectModel
 			($delete ? ' AND entity.deleted = 0' : '')
 		);
 	}
-}
+}
\ No newline at end of file