diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
index 4a5e2dc..89602db 100644
--- a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
@@ -51,7 +51,7 @@ CREATE TABLE invoices (
PRIMARY KEY(record_id)
) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
CREATE UNIQUE INDEX invoices_id ON invoices(id);
-CREATE INDEX invoices_account_target ON invoices(account_id ASC, target_date);
+CREATE INDEX invoices_account ON invoices(account_id ASC);
CREATE INDEX invoices_tenant_account_record_id ON invoices(tenant_record_id, account_record_id);
DROP TABLE IF EXISTS invoice_payments;
diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20163502123517__invoice_ha_459.sql b/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20163502123517__invoice_ha_459.sql
index b882364..efe7a94 100644
--- a/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20163502123517__invoice_ha_459.sql
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20163502123517__invoice_ha_459.sql
@@ -20,3 +20,6 @@ alter table invoice_items modify start_date date;
alter table invoices add column parent_invoice bool NOT NULL DEFAULT FALSE after migrated;
alter table invoices modify target_date date;
+
+drop index invoices_account_target on invoices;
+create index invoices_account on invoices(account_id asc);