diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index 788796d48..5e6c1ad09 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -2236,7 +2236,7 @@ CREATE TABLE `PREFIX_stock_available` (
   KEY `id_shop_group` (`id_shop_group`),
   KEY `id_product` (`id_product`),
   KEY `id_product_attribute` (`id_product_attribute`),
-  UNIQUE `product_sqlstock` ( `id_product` , `id_product_attribute` , `id_shop` )
+  UNIQUE `product_sqlstock` (`id_product` , `id_product_attribute` , `id_shop`, `id_shop_group`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_supply_order` (
diff --git a/install-dev/upgrade/sql/1.5.4.0.sql b/install-dev/upgrade/sql/1.5.4.0.sql
index 30b006af1..831476016 100644
--- a/install-dev/upgrade/sql/1.5.4.0.sql
+++ b/install-dev/upgrade/sql/1.5.4.0.sql
@@ -32,3 +32,6 @@ CREATE TABLE `PREFIX_tab_module_preference` (
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 /* PHP:add_new_tab(AdminMarketing, es:Marketing|it:Marketing|en:Marketing|de:Marketing|fr:Marketing,  1); */;
+
+ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
+ALTER TABLE `PREFIX_stock_available` ADD UNIQUE `product_sqlstock` (`id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`);
\ No newline at end of file