diff --git a/.github/import_generation.txt b/.github/import_generation.txt
index aabe6ec3909..2bd5a0a98a3 100644
--- a/.github/import_generation.txt
+++ b/.github/import_generation.txt
@@ -1 +1 @@
-21
+22
diff --git a/.github/last_commit.txt b/.github/last_commit.txt
index 72b20a13cc8..4a1cba507c2 100644
--- a/.github/last_commit.txt
+++ b/.github/last_commit.txt
@@ -1 +1 @@
-362cf04ca2b49a71004ea0558dbf5a041db0e0c6
+a1abe1a8139be6a6188d79503a63aa2e5068c6c1
diff --git a/src/client/federated_topic/impl/federation_observer.cpp b/src/client/federated_topic/impl/federation_observer.cpp
index 9d40845c628..2085d064ac3 100644
--- a/src/client/federated_topic/impl/federation_observer.cpp
+++ b/src/client/federated_topic/impl/federation_observer.cpp
@@ -136,8 +136,6 @@ void TFederatedDbObserverImpl::OnFederationDiscovery(TStatus&& status, Ydb::Fede
                 << "OnFederationDiscovery fall back to single mode, database=" << DbDriverState_->Database);
             FederatedDbState->Status = TPlainStatus{};  // SUCCESS
             FederatedDbState->ControlPlaneEndpoint = DbDriverState_->DiscoveryEndpoint;
-            auto dbState = Connections_->GetDriverState(std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt);
-            FederatedDbState->ControlPlaneEndpoint = dbState->DiscoveryEndpoint;
             // FederatedDbState->SelfLocation = ???;
             auto db = std::make_shared<Ydb::FederationDiscovery::DatabaseInfo>();
             db->set_path(TStringType{DbDriverState_->Database});
@@ -145,7 +143,6 @@ void TFederatedDbObserverImpl::OnFederationDiscovery(TStatus&& status, Ydb::Fede
             db->set_status(Ydb::FederationDiscovery::DatabaseInfo_Status_AVAILABLE);
             db->set_weight(100);
             FederatedDbState->DbInfos.emplace_back(std::move(db));
-
         } else {
             if (status.IsSuccess()) {
                 ScheduleFederationDiscoveryImpl(REDISCOVERY_DELAY);