diff --git a/store/shared/migrate/mysql/ddl_gen.go b/store/shared/migrate/mysql/ddl_gen.go
index 08f3b7bfb..f60b6098c 100644
--- a/store/shared/migrate/mysql/ddl_gen.go
+++ b/store/shared/migrate/mysql/ddl_gen.go
@@ -160,6 +160,10 @@ var migrations = []struct {
 		name: "create-table-template",
 		stmt: createTableTemplate,
 	},
+	{
+		name: "create-index-template-namespace",
+		stmt: createIndexTemplateNamespace,
+	},
 }
 
 // Migrate performs the database migration. If the migration fails
@@ -677,6 +681,8 @@ CREATE TABLE IF NOT EXISTS templates (
     ,template_updated INTEGER
     ,UNIQUE(template_name, template_namespace)
     );
-
-CREATE INDEX IF NOT EXISTS ix_template_namespace ON templates (template_namespace);
+`
+
+var createIndexTemplateNamespace = `
+CREATE INDEX ix_template_namespace ON templates (template_namespace);
 `
diff --git a/store/shared/migrate/mysql/files/015_create_table_templates.sql b/store/shared/migrate/mysql/files/015_create_table_templates.sql
index b0a8de4bb..ab8ddc1eb 100644
--- a/store/shared/migrate/mysql/files/015_create_table_templates.sql
+++ b/store/shared/migrate/mysql/files/015_create_table_templates.sql
@@ -10,4 +10,6 @@ CREATE TABLE IF NOT EXISTS templates (
     ,UNIQUE(template_name, template_namespace)
     );
 
-CREATE INDEX IF NOT EXISTS ix_template_namespace ON templates (template_namespace);
+-- name: create-index-template-namespace
+
+CREATE INDEX ix_template_namespace ON templates (template_namespace);
\ No newline at end of file