diff --git a/application/src/main/data/upgrade/basic/schema_update.sql b/application/src/main/data/upgrade/basic/schema_update.sql
index 7a33c481c2..4897a35b41 100644
--- a/application/src/main/data/upgrade/basic/schema_update.sql
+++ b/application/src/main/data/upgrade/basic/schema_update.sql
@@ -60,7 +60,7 @@ WHERE trigger_type = 'RATE_LIMITS'
 
 -- UPDATE NOTIFICATION RULE CASSANDRA RATE LIMITS END
 
--- CREATE AI MODEL SETTINGS TABLE START
+-- CREATE AI MODEL SETTINGS TABLE AND INDEX START
 
 CREATE TABLE ai_model_settings (
     id              UUID          NOT NULL PRIMARY KEY,
@@ -74,4 +74,6 @@ CREATE TABLE ai_model_settings (
     CONSTRAINT ai_model_settings_external_id_unq_key UNIQUE (tenant_id, external_id)
 );
 
--- CREATE AI MODEL SETTINGS TABLE END
+CREATE INDEX idx_ai_model_settings_tenant_id ON ai_model_settings(tenant_id);
+
+-- CREATE AI MODEL SETTINGS TABLE AND INDEX END
diff --git a/dao/src/main/resources/sql/schema-entities-idx.sql b/dao/src/main/resources/sql/schema-entities-idx.sql
index ad311f00df..5611be2121 100644
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
@@ -131,3 +131,5 @@ CREATE INDEX IF NOT EXISTS idx_resource_type_public_resource_key ON resource(res
 CREATE INDEX IF NOT EXISTS mobile_app_bundle_tenant_id ON mobile_app_bundle(tenant_id);
 
 CREATE INDEX IF NOT EXISTS idx_job_tenant_id ON job(tenant_id);
+
+CREATE INDEX IF NOT EXISTS idx_ai_model_settings_tenant_id ON ai_model_settings(tenant_id);