diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt
index a08b1ed20..3f8fb3a7b 100644
--- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt
+++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt
@@ -340,7 +340,10 @@ class EnvoySnapshotFactory(
         ).also { e ->
             val list = e.mapNotNull { el -> el.endpointsList.find { x -> x.lbEndpointsList.isEmpty() } }
             val rPolicy = group.proxySettings.outgoing.defaultServiceSettings.routingPolicy
-            if (list.isNotEmpty() && list.none { it.locality.zone.contains("gcp") } && rPolicy.autoServiceTag) {
+            if (list.isNotEmpty() &&
+                list.none { it.locality.zone.contains(properties.loadBalancing.trafficSplitting.zoneName) } &&
+                rPolicy.autoServiceTag
+            ) {
                 logger.warn(
                     "Some of service ${group.serviceName} dependencies have ClusterLoadAssignment with empty " +
                         "lbEndpoints: $list, routingPolicy: $rPolicy, all endpoints: $e"