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..bc25ce9320
--- /dev/null
+++ b/orcid-persistence/src/main/resources/db/updates/add_public_api_daily_rate_limit_indexes.xml
@@ -0,0 +1,18 @@
+<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-IP-ADDRESS" author="Camelia Dumitru" runInTransaction="false" dbms="postgresql">
+		<sql>create index concurrently if not exists idx_ip_address on public_api_daily_rate_limit(ip_address);</sql>
+	</changeSet>
+	<changeSet id="ADD-PAPI-LIMIT-INDEXES-CLIENT-ID" author="Camelia Dumitru" runInTransaction="false" dbms="postgresql">
+		<sql>create index concurrently if not exists idx_client_id on public_api_daily_rate_limit(client_id);</sql>
+	</changeSet>
+	<changeSet id="ADD-PAPI-LIMIT-INDEXES-REQUEST-DATE" author="Camelia Dumitru" runInTransaction="false" dbms="postgresql">
+		<sql>create index concurrently if not exists idx_request_date on public_api_daily_rate_limit(request_date);</sql>
+	</changeSet>
+	<changeSet id="ADD-PAPI-LIMIT-INDEXES-COMPOSITE" author="Camelia Dumitru" runInTransaction="false" dbms="postgresql">
+		<sql>create index concurrently if not exists idx_client_ip_date on public_api_daily_rate_limit(client_id, ip_address, request_date);</sql>
+	</changeSet>
+	
+</databaseChangeLog>