diff --git a/util/db/helmrepository.go b/util/db/helmrepository.go
index 117c52cfc8..6c4bbb3b2d 100644
--- a/util/db/helmrepository.go
+++ b/util/db/helmrepository.go
@@ -7,6 +7,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/utils/pointer"
 
 	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/util/settings"
@@ -57,7 +58,7 @@ func (db *db) ListHelmRepositories(ctx context.Context) ([]*v1alpha1.Repository,
 		}
 		result[i] = repo
 	}
-	repos, err := db.ListRepositories(ctx)
+	repos, err := db.listRepositories(ctx, pointer.StringPtr("helm"))
 	if err != nil {
 		return nil, err
 	}
diff --git a/util/db/repository.go b/util/db/repository.go
index 1764548e71..0b717a4844 100644
--- a/util/db/repository.go
+++ b/util/db/repository.go
@@ -113,6 +113,10 @@ func (db *db) GetRepository(ctx context.Context, repoURL string) (*appsv1.Reposi
 }
 
 func (db *db) ListRepositories(ctx context.Context) ([]*appsv1.Repository, error) {
+	return db.listRepositories(ctx, nil)
+}
+
+func (db *db) listRepositories(ctx context.Context, repoType *string) ([]*appsv1.Repository, error) {
 	inRepos, err := db.settingsMgr.GetRepositories()
 	if err != nil {
 		return nil, err
@@ -120,12 +124,13 @@ func (db *db) ListRepositories(ctx context.Context) ([]*appsv1.Repository, error
 
 	var repos []*appsv1.Repository
 	for _, inRepo := range inRepos {
-		r, err := db.GetRepository(ctx, inRepo.URL)
-		if err != nil {
-			return nil, err
+		if repoType == nil || *repoType == inRepo.Type {
+			r, err := db.GetRepository(ctx, inRepo.URL)
+			if err != nil {
+				return nil, err
+			}
+			repos = append(repos, r)
 		}
-		repos = append(repos, r)
-
 	}
 	return repos, nil
 }