diff --git a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
index 2631c16..0b1b84a 100644
--- a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
+++ b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
@@ -32,7 +32,6 @@ CREATE TABLE tenant_kvs (
updated_by varchar(50) DEFAULT NULL,
PRIMARY KEY(record_id)
) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
-CREATE INDEX tenant_kvs_key ON tenant_kvs(tenant_key);
CREATE INDEX tenant_kvs_trid_key ON tenant_kvs(tenant_record_id, tenant_key);
diff --git a/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql b/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql
index 3536f80..9fd7191 100644
--- a/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql
+++ b/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql
@@ -1 +1,2 @@
CREATE INDEX tenant_kvs_trid_key ON tenant_kvs(tenant_record_id, tenant_key);
+DROP INDEX tenant_kvs_key ON tenant_kvs;
