diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
index 760aec36e..8dba3f1e1 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -185,4 +185,5 @@
     <include file="parts/0164_transaction_summary_with_asset_owner_report_accrual_adj_report_separately_and_exclude_accrual_activity.xml" relativeToChangelogFile="true" />
     <include file="parts/0165_add_credited_interest_to_instalment.xml" relativeToChangelogFile="true" />
     <include file="parts/0166_transaction_summary_with_asset_owner_report_charge_adjustment_fix.xml" relativeToChangelogFile="true" />
+    <include file="parts/0167_create_m_calendar_instance_index.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0167_create_m_calendar_instance_index.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0167_create_m_calendar_instance_index.xml
new file mode 100644
index 000000000..125432aca
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0167_create_m_calendar_instance_index.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+    <changeSet author="fineract" id="1" runInTransaction="false" context="postgresql">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <indexExists tableName="m_calendar_instance" columnNames="entity_id, entity_type_enum"/>
+            </not>
+        </preConditions>
+        <sql>
+            create index concurrently idx_m_calendar_instance_entity_id_entity_type on m_calendar_instance(entity_id, entity_type_enum);
+        </sql>
+    </changeSet>
+
+    <changeSet author="fineract" id="1" runInTransaction="false" context="mysql">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <indexExists tableName="m_calendar_instance" columnNames="entity_id, entity_type_enum"/>
+            </not>
+        </preConditions>
+        <createIndex indexName="idx_m_calendar_instance_entity_id_entity_type" tableName="m_calendar_instance">
+            <column name="entity_id"/>
+            <column name="entity_type_enum"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>