diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index c52de6980..7c0e26579 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -104,6 +104,7 @@ func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec spec.Postgresql
 		deleteOptions:    &meta_v1.DeleteOptions{OrphanDependents: &orphanDependents},
 		podEventsQueue:   podEventsQueue,
 		KubeClient:       kubeClient,
+		teamsAPIClient:   teams.NewTeamsAPI(cfg.OpConfig.TeamsAPIUrl, logger.Logger),
 	}
 
 	return cluster
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index ff6e29c26..36db103c2 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -15,7 +15,6 @@ import (
 	"github.com/zalando-incubator/postgres-operator/pkg/util/config"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
-	"github.com/zalando-incubator/postgres-operator/pkg/util/teams"
 )
 
 type Config struct {
@@ -32,10 +31,9 @@ type Controller struct {
 	config   Config
 	opConfig *config.Config
 
-	logger         *logrus.Entry
-	KubeClient     k8sutil.KubernetesClient
-	RestClient     rest.Interface
-	TeamsAPIClient *teams.API
+	logger     *logrus.Entry
+	KubeClient k8sutil.KubernetesClient
+	RestClient rest.Interface
 
 	clustersMu sync.RWMutex
 	clusters   map[spec.NamespacedName]*cluster.Cluster
@@ -113,8 +111,6 @@ func (c *Controller) initController() {
 		c.logger.Level = logrus.DebugLevel
 	}
 
-	c.TeamsAPIClient = teams.NewTeamsAPI(c.opConfig.TeamsAPIUrl, c.logger.Logger)
-
 	if err := c.createTPR(); err != nil {
 		c.logger.Fatalf("could not register ThirdPartyResource: %v", err)
 	}