diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index bb3211086..c42703d14 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -295,6 +295,10 @@ class ShopCore extends ObjectModel
 	 */
 	public static function initialize()
 	{
+		// Optimization - don't redirect and allow WS and other script to work
+		if (!($id_shop = Tools::getValue('id_shop')))
+			$_GET['id_shop'] = Configuration::get('PS_SHOP_DEFAULT');
+
 		// Find current shop from URL
 		if (!($id_shop = Tools::getValue('id_shop')) || defined('_PS_ADMIN_DIR_'))
 		{