diff --git a/install-dev/upgrade/php/p1540_add_missing_columns.php b/install-dev/upgrade/php/p1540_add_missing_columns.php
index 4d7775b0a..a86938056 100644
--- a/install-dev/upgrade/php/p1540_add_missing_columns.php
+++ b/install-dev/upgrade/php/p1540_add_missing_columns.php
@@ -47,10 +47,15 @@ function p1540_add_missing_columns()
 			$list_fields[$k] = $field['Field'];
 
 		if (!in_array('id_shop', $list_fields))
-			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'layered_product_attribute` ADD `id_shop` INT( 10 ) UNSIGNED NOT NULL DEFAULT "1" AFTER `id_attribute_group` '))
+			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'layered_product_attribute` ADD `id_shop` INT( 10 ) UNSIGNED NOT NULL DEFAULT "1" AFTER `id_attribute_group`'))
 				$errors[] = Db::getInstance()->getMsgError();				
 	}
-		
+	
+	$key_exists = Db::getInstance()->executeS('SHOW INDEX FROM `'._DB_PREFIX_.'stock_available` WHERE KEY_NAME = "product_sqlstock"');;
+	if (is_array($key_exists))
+		if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'stock_available` DROP INDEX `product_sqlstock`'))
+			$errors[] = Db::getInstance()->getMsgError();
+
 	if (count($errors))
 		return array('error' => 1, 'msg' => implode(',', $errors)) ;	
 }
\ No newline at end of file
diff --git a/install-dev/upgrade/sql/1.5.4.0.sql b/install-dev/upgrade/sql/1.5.4.0.sql
index 4e6e1cee2..4c291e693 100644
--- a/install-dev/upgrade/sql/1.5.4.0.sql
+++ b/install-dev/upgrade/sql/1.5.4.0.sql
@@ -33,7 +33,8 @@ CREATE TABLE `PREFIX_tab_module_preference` (
 
 /* 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`;
+/* PHP:p1540_add_missing_columns(); */;
+
 ALTER TABLE `PREFIX_stock_available` ADD UNIQUE `product_sqlstock` (`id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`);
 
 UPDATE PREFIX_configuration SET `value` = '8388608' WHERE `name` = 'PS_PRODUCT_PICTURE_MAX_SIZE' AND `value` <= '524288';