diff --git a/api/db/db_models.py b/api/db/db_models.py
index da0f741e78..afc59ad576 100644
--- a/api/db/db_models.py
+++ b/api/db/db_models.py
@@ -1155,7 +1155,7 @@ class CompilationTemplate(DataBaseModel):
 
     class Meta:
         db_table = "compilation_template"
-        indexes = ((("tenant_id", "name", "is_builtin", "status"), True),)
+        indexes = ((("tenant_id", "group_id", "name", "is_builtin", "status"), True),)
 
 
 class CompilationTemplateGroup(DataBaseModel):
diff --git a/api/db/services/compilation_template_group_service.py b/api/db/services/compilation_template_group_service.py
index 81c6f8b423..00bf0e09dc 100644
--- a/api/db/services/compilation_template_group_service.py
+++ b/api/db/services/compilation_template_group_service.py
@@ -332,6 +332,7 @@ class CompilationTemplateGroupService(CommonService):
                     config = CompilationTemplateService.fill_config_default_llm(config, tenant_id)
                     duplicate_query = CompilationTemplate.select().where(
                         CompilationTemplate.tenant_id == tenant_id,
+                        CompilationTemplate.group_id == group_id,
                         CompilationTemplate.name == name,
                         ~CompilationTemplate.is_builtin,
                         CompilationTemplate.status == StatusEnum.VALID.value,
@@ -415,6 +416,7 @@ class CompilationTemplateGroupService(CommonService):
         config = CompilationTemplateService.fill_config_default_llm(config, tenant_id)
         duplicate = CompilationTemplate.select().where(
             CompilationTemplate.tenant_id == tenant_id,
+            CompilationTemplate.group_id == group_id,
             CompilationTemplate.name == name,
             ~CompilationTemplate.is_builtin,
             CompilationTemplate.status == StatusEnum.VALID.value,