diff --git a/sql-files/upgrades/upgrade_20221001.sql b/sql-files/upgrades/upgrade_20221001.sql
new file mode 100644
index 0000000000..a2c09ba059
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20221001.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `merchant_configs`
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`world_name`, `account_id`, `char_id`, `store_type`)
+;
diff --git a/sql-files/web.sql b/sql-files/web.sql
index d5c952fee1..b0c3311a3e 100644
--- a/sql-files/web.sql
+++ b/sql-files/web.sql
@@ -46,5 +46,5 @@ CREATE TABLE IF NOT EXISTS `merchant_configs` (
   `char_id` INT(11) UNSIGNED NOT NULL,
   `store_type` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   `data` longtext NOT NULL,
-  PRIMARY KEY (`world_name`, `account_id`, `char_id`)
+  PRIMARY KEY (`world_name`, `account_id`, `char_id`, `store_type`)
 ) ENGINE=MyISAM;