1 files changed, 7 insertions, 1 deletions
diff --git a/src/buildtool/serve_api/serve_service/configuration.cpp b/src/buildtool/serve_api/serve_service/configuration.cpp
index 2c1a14e4..503267f9 100644
--- a/src/buildtool/serve_api/serve_service/configuration.cpp
+++ b/src/buildtool/serve_api/serve_service/configuration.cpp
@@ -27,7 +27,13 @@ auto ConfigurationService::RemoteExecutionEndpoint(
     const ::justbuild::just_serve::RemoteExecutionEndpointRequest* /*request*/,
     ::justbuild::just_serve::RemoteExecutionEndpointResponse* response)
     -> ::grpc::Status {
-    auto address = remote_config_.remote_address;
+    std::optional<ServerAddress> address;
+    if (serve_config_.client_execution_address.has_value()) {
+        address = serve_config_.client_execution_address;
+    }
+    else {
+        address = remote_config_.remote_address;
+    }
     response->set_address(address ? address->ToJson().dump() : std::string());
     return ::grpc::Status::OK;
 }