diff --git a/f_install/sql/common_schema.sql b/f_install/sql/common_schema.sql
index 67d17abd..d03df143 100644
--- a/f_install/sql/common_schema.sql
+++ b/f_install/sql/common_schema.sql
@@ -59,7 +59,7 @@ ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 ###################
 # KV storage
 ###################
-CREATE TABLE `storage` (
+CREATE TABLE if not exists `storage` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`namespace` VARCHAR(40) NOT NULL,
 	`key` VARCHAR(40) NOT NULL,
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 92925964..cafda9b9 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -611,7 +611,7 @@ ENGINE=MyISAM;
 ###################
 # KV storage
 ###################
-CREATE TABLE `storage` (
+CREATE TABLE if not exists `storage` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`namespace` VARCHAR(40) NOT NULL,
 	`key` VARCHAR(40) NOT NULL,