diff --git a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go
index 3e3f113a61..dd8e975c9e 100644
--- a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go
+++ b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go
@@ -96,8 +96,10 @@ func (impl CiTemplateRepositoryImpl) FindByAppId(appId int) (ciTemplate *CiTempl
 
 func (impl CiTemplateRepositoryImpl) FindByDockerRegistryId(dockerRegistryId string) (ciTemplates []*CiTemplate, err error) {
 	err = impl.dbConnection.Model(&ciTemplates).
-		Where("docker_registry_id =? ", dockerRegistryId).
-		Where("active = ?", true).
+		Join("JOIN app a ON ci_template.app_id = a.id").
+		Where("ci_template.docker_registry_id = ?", dockerRegistryId).
+		Where("ci_template.active = ?", true).
+		Where("a.active = ?", true).
 		Select()
 	return ciTemplates, err
 }