diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index ac11f2750..e6a7c3aa8 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -361,8 +361,10 @@ func (c *Cluster) Create() error {
 	// something fails, report warning
 	c.createConnectionPooler(c.installLookupFunction)
 
-	if err = c.syncStreams(); err != nil {
-		c.logger.Errorf("could not create streams: %v", err)
+	if len(c.Spec.Streams) > 0 {
+		if err = c.syncStreams(); err != nil {
+			c.logger.Errorf("could not create streams: %v", err)
+		}
 	}
 
 	return nil
@@ -859,9 +861,11 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
 		updateFailed = true
 	}
 
-	if err := c.syncStreams(); err != nil {
-		c.logger.Errorf("could not sync streams: %v", err)
-		updateFailed = true
+	if len(c.Spec.Streams) > 0 {
+		if err := c.syncStreams(); err != nil {
+			c.logger.Errorf("could not sync streams: %v", err)
+			updateFailed = true
+		}
 	}
 
 	if !updateFailed {
diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go
index 9491fc194..55db338f1 100644
--- a/pkg/cluster/sync.go
+++ b/pkg/cluster/sync.go
@@ -129,10 +129,12 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
 		return fmt.Errorf("could not sync connection pooler: %v", err)
 	}
 
-	c.logger.Debug("syncing streams")
-	if err = c.syncStreams(); err != nil {
-		err = fmt.Errorf("could not sync streams: %v", err)
-		return err
+	if len(c.Spec.Streams) > 0 {
+		c.logger.Debug("syncing streams")
+		if err = c.syncStreams(); err != nil {
+			err = fmt.Errorf("could not sync streams: %v", err)
+			return err
+		}
 	}
 
 	// Major version upgrade must only run after success of all earlier operations, must remain last item in sync