diff --git a/agent/consul/server_connect.go b/agent/consul/server_connect.go
index f424437996..a5c569d550 100644
--- a/agent/consul/server_connect.go
+++ b/agent/consul/server_connect.go
@@ -16,7 +16,7 @@ func (s *Server) getCARoots(ws memdb.WatchSet, state *state.Store) (*structs.Ind
 	if err != nil {
 		return nil, err
 	}
-	if config == nil {
+	if config == nil || config.ClusterID == "" {
 		return nil, fmt.Errorf("CA has not finished initializing")
 	}
 
@@ -31,9 +31,6 @@ func (s *Server) getCARoots(ws memdb.WatchSet, state *state.Store) (*structs.Ind
 	}
 
 	indexedRoots.TrustDomain = signingID.Host()
-	if indexedRoots.TrustDomain == "" {
-		return nil, fmt.Errorf("CA has not finished initializing")
-	}
 
 	indexedRoots.Index, indexedRoots.Roots = index, roots
 	if indexedRoots.Roots == nil {
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/verify.bats b/test/integration/connect/envoy/case-wanfed-gw/primary/verify.bats
index 3c9d899985..5be23d04c0 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/verify.bats
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/verify.bats
@@ -23,7 +23,7 @@ load helpers
 }
 
 @test "primary should be able to rpc to the secondary" {
-  retry_default curl -sL -f -XPUT localhost:8500/v1/kv/foo?dc=secondary -d'{"Value":"bar"}'
+  retry_long curl -sL -f -XPUT localhost:8500/v1/kv/foo?dc=secondary -d'{"Value":"bar"}'
 }
 
 @test "wan pool should show 2 healthy nodes" {