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 d1f1d6318..99e8e006a 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
@@ -282,8 +282,8 @@ class EnvoySnapshotFactory(
                 //    commonly used
                 endpointsFactory.filterEndpoints(endpoints, routeSpec.settings.routingPolicy).let {
                     endpointsFactory.assignLocalityWeights(routeSpec, it).also { la ->
-                        if (la.endpointsList.any { el -> el.lbEndpointsList.isEmpty() }) {
-                            @Suppress()
+                        if (la.endpointsList.any { el -> el.lbEndpointsList.isEmpty() } &&
+                            routeSpec.settings.routingPolicy.autoServiceTag) {
                             logger.warn(
                                 "ClusterLoadAssignment for ${routeSpec.clusterName} has empty lbEndpoints, " +
                                     "original clusterLoadAssignment: $endpoints"