diff --git a/ydb/core/kafka_proxy/actors/kafka_metadata_actor.cpp b/ydb/core/kafka_proxy/actors/kafka_metadata_actor.cpp
index 9e9331f3655b..64aea7602ab4 100644
--- a/ydb/core/kafka_proxy/actors/kafka_metadata_actor.cpp
+++ b/ydb/core/kafka_proxy/actors/kafka_metadata_actor.cpp
@@ -46,6 +46,8 @@ void TKafkaMetadataActor::AddCurrentNodeToBrokers() {
 }
 
 void TKafkaMetadataActor::SendDiscoveryRequest() {
+    if (!Context->Config.GetEnableEndpointDiscovery())
+        return;
     DiscoveryRequested = true;
     if (!DiscoveryCacheActor) {
         OwnDiscoveryCache = true;
diff --git a/ydb/core/kafka_proxy/ut/port_discovery_ut.cpp b/ydb/core/kafka_proxy/ut/port_discovery_ut.cpp
index 4b5de1b9f145..0b0a5ad104c8 100644
--- a/ydb/core/kafka_proxy/ut/port_discovery_ut.cpp
+++ b/ydb/core/kafka_proxy/ut/port_discovery_ut.cpp
@@ -138,6 +138,7 @@ namespace NKafka::NTests {
             ui16 kafkaPort = pm->GetPort();
             auto serverSettings = NPersQueueTests::PQSettings(0).SetDomainName("Root").SetNodeCount(1);
             serverSettings.AppConfig->MutableKafkaProxyConfig()->SetEnableKafkaProxy(true);
+            serverSettings.AppConfig->MutableKafkaProxyConfig()->SetEnableEndpointDiscovery(true);
             serverSettings.AppConfig->MutableKafkaProxyConfig()->SetListeningPort(kafkaPort);
             NPersQueue::TTestServer server(serverSettings, true, {}, NActors::NLog::PRI_INFO, pm);
 
@@ -178,6 +179,8 @@ namespace NKafka::NTests {
             ui16 kafkaPort = pm->GetPort();
             auto serverSettings = NPersQueueTests::PQSettings(0).SetDomainName("Root").SetNodeCount(1);
             serverSettings.AppConfig->MutableKafkaProxyConfig()->SetEnableKafkaProxy(true);
+            serverSettings.AppConfig->MutableKafkaProxyConfig()->SetEnableEndpointDiscovery(true);
+
             serverSettings.AppConfig->MutableKafkaProxyConfig()->SetListeningPort(kafkaPort);
             NPersQueue::TTestServer server(serverSettings, true, {}, NActors::NLog::PRI_INFO, pm);
 
diff --git a/ydb/core/kafka_proxy/ut/ut_protocol.cpp b/ydb/core/kafka_proxy/ut/ut_protocol.cpp
index 9d9f12c78b80..04c058508576 100644
--- a/ydb/core/kafka_proxy/ut/ut_protocol.cpp
+++ b/ydb/core/kafka_proxy/ut/ut_protocol.cpp
@@ -99,6 +99,7 @@ class TTestServer {
         cst->SetName("data-transfer2");
 
         appConfig.MutableKafkaProxyConfig()->SetEnableKafkaProxy(true);
+        appConfig.MutableKafkaProxyConfig()->SetEnableEndpointDiscovery(true);
         appConfig.MutableKafkaProxyConfig()->SetListeningPort(Port);
         appConfig.MutableKafkaProxyConfig()->SetMaxMessageSize(1024);
         appConfig.MutableKafkaProxyConfig()->SetMaxInflightSize(2048);
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
index 625af0ca173e..febea659ed41 100644
--- a/ydb/core/protos/config.proto
+++ b/ydb/core/protos/config.proto
@@ -2085,6 +2085,7 @@ message TKafkaProxyConfig {
 
     optional TProxy Proxy = 7;
     optional bool MeteringV2Enabled = 10 [default = false];
+    optional bool EnableEndpointDiscovery = 11 [default = false];
 }
 
 message TAwsCompatibilityConfig {