diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
index 4e62d97c44..fafbdbe3e0 100644
--- a/server/cluster/cluster.go
+++ b/server/cluster/cluster.go
@@ -55,6 +55,7 @@ func (s *Server) Create(ctx context.Context, q *ClusterCreateRequest) (*appv1.Cl
 		return nil, err
 	}
 
+	c.ConnectionState = appv1.ConnectionState{Status: appv1.ConnectionStatusSuccessful}
 	clust, err := s.db.CreateCluster(ctx, c)
 	if status.Convert(err).Code() == codes.AlreadyExists {
 		// act idempotent if existing spec matches new spec
diff --git a/server/repository/repository.go b/server/repository/repository.go
index 2540bd96ad..efd9886cce 100644
--- a/server/repository/repository.go
+++ b/server/repository/repository.go
@@ -121,6 +121,8 @@ func (s *Server) Create(ctx context.Context, q *RepoCreateRequest) (*appsv1.Repo
 	if err != nil {
 		return nil, err
 	}
+
+	r.ConnectionState = appsv1.ConnectionState{Status: appsv1.ConnectionStatusSuccessful}
 	repo, err := s.db.CreateRepository(ctx, r)
 	if status.Convert(err).Code() == codes.AlreadyExists {
 		// act idempotent if existing spec matches new spec