1 files changed, 3 insertions, 2 deletions
diff --git a/yt/yt/client/queue_client/consumer_client.cpp b/yt/yt/client/queue_client/consumer_client.cpp
index d3d8a7cb22..cccac4b318 100644
--- a/yt/yt/client/queue_client/consumer_client.cpp
+++ b/yt/yt/client/queue_client/consumer_client.cpp
@@ -672,12 +672,13 @@ ISubConsumerClientPtr CreateSubConsumerClient(
 {
     auto queueCluster = queuePath.GetCluster();
     if (!queueCluster && queueClusterClient) {
-        if (auto queueClusterFromClient = queueClusterClient->GetClusterName()) {
+        // `CreateSubConsumerClient` function calls `WaitFor` already, it will be fixed later.
+        if (auto queueClusterFromClient = WaitFor(queueClusterClient->GetClusterName()).ValueOrThrow()) {
             queueCluster = *queueClusterFromClient;
         }
     }
     if (!queueCluster) {
-        if (auto clientCluster = consumerClusterClient->GetClusterName()) {
+        if (auto clientCluster = WaitFor(consumerClusterClient->GetClusterName()).ValueOrThrow()) {
             queueCluster = *clientCluster;
         }
     }