From 573c96d6af6aa8778efd9bff59f9bc0dab94c495 Mon Sep 17 00:00:00 2001
From: Livio Spring <livio.a@gmail.com>
Date: Fri, 2 May 2025 13:44:24 +0200
Subject: [PATCH] fix merge

---
 cmd/start/start.go      | 4 ----
 internal/queue/queue.go | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/cmd/start/start.go b/cmd/start/start.go
index 4c8709c4a7..e3d84625b4 100644
--- a/cmd/start/start.go
+++ b/cmd/start/start.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/tls"
 	_ "embed"
-	"errors"
 	"fmt"
 	"math"
 	"net/http"
@@ -271,9 +270,6 @@ func startZitadel(ctx context.Context, config *Config, masterKey string, server
 	actionsLogstoreSvc := logstore.New(queries, actionsExecutionDBEmitter, actionsExecutionStdoutEmitter)
 	actions.SetLogstoreService(actionsLogstoreSvc)
 
-	if !config.Notifications.LegacyEnabled && dbClient.Type() == "cockroach" {
-		return errors.New("notifications must be set to LegacyEnabled=true when using CockroachDB")
-	}
 	q, err := queue.NewQueue(&queue.Config{
 		Client: dbClient,
 	})
diff --git a/internal/queue/queue.go b/internal/queue/queue.go
index b45a7eb8cb..d680221753 100644
--- a/internal/queue/queue.go
+++ b/internal/queue/queue.go
@@ -27,9 +27,6 @@ type Config struct {
 }
 
 func NewQueue(config *Config) (_ *Queue, err error) {
-	if config.Client.Type() == "cockroach" {
-		return nil, nil
-	}
 	return &Queue{
 		driver: riverpgxv5.New(config.Client.Pool),
 		config: &river.Config{