diff --git a/orcid-persistence/src/main/resources/db-master.xml b/orcid-persistence/src/main/resources/db-master.xml
index a4a3b726fd..2d893fead1 100644
--- a/orcid-persistence/src/main/resources/db-master.xml
+++ b/orcid-persistence/src/main/resources/db-master.xml
@@ -406,4 +406,5 @@
   <include file="/db/updates/add_unique_constraint_external_id_disambiguated_org.xml" />
   <include file="/db/updates/add_date_verified_to_email.xml" />
   <include file="/db/updates/create_public_api_daily_rate_limit.xml" />
+  <include file="/db/updates/add_public_api_daily_rate_limit_indexes.xml" />
 </databaseChangeLog>
\ No newline at end of file
diff --git a/orcid-persistence/src/main/resources/db/updates/add_public_api_daily_rate_limit_indexes.xml b/orcid-persistence/src/main/resources/db/updates/add_public_api_daily_rate_limit_indexes.xml
new file mode 100644
index 0000000000..128b37fc6f
--- /dev/null
+++ b/orcid-persistence/src/main/resources/db/updates/add_public_api_daily_rate_limit_indexes.xml
@@ -0,0 +1,32 @@
+<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-2.0.xsd">	
+	            
+    
+	<changeSet id="ADD-PAPI-LIMIT-INDEXES" author="Camelia Dumitru">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<indexExists indexName="idx_ip_address" tableName="public_api_daily_rate_limit" />
+			</not>
+			<not>
+				<indexExists indexName="idx_client_id" tableName="public_api_daily_rate_limit" />
+			</not>
+			<not>
+				<indexExists indexName="idx_request_date" tableName="public_api_daily_rate_limit" />
+			</not>
+		</preConditions>
+		<!-- Add indexes -->
+	    <createIndex indexName="idx_ip_address" tableName="public_api_daily_rate_limit">
+	        <column name="ip_address"/>
+	    </createIndex>
+	
+	    <createIndex indexName="idx_client_id" tableName="public_api_daily_rate_limit">
+	        <column name="client_id"/>
+	    </createIndex>
+	
+	    <createIndex indexName="idx_request_date" tableName="public_api_daily_rate_limit">
+	        <column name="request_date"/>
+	    </createIndex>
+	</changeSet>
+	
+</databaseChangeLog>
\ No newline at end of file