1 files changed, 1 insertions, 6 deletions
diff --git a/src/buildtool/serve_api/serve_service/configuration.cpp b/src/buildtool/serve_api/serve_service/configuration.cpp
index 4a103ea4..a4d0ba88 100644
--- a/src/buildtool/serve_api/serve_service/configuration.cpp
+++ b/src/buildtool/serve_api/serve_service/configuration.cpp
@@ -24,11 +24,6 @@ auto ConfigurationService::RemoteExecutionEndpoint(
     ::justbuild::just_serve::RemoteExecutionEndpointResponse* response)
     -> ::grpc::Status {
     auto address = RemoteExecutionConfig::RemoteAddress();
-    if (!address) {
-        return grpc::Status{grpc::StatusCode::INTERNAL,
-                            "could not obtain the address of the associated "
-                            "remote execution endpoint"};
-    }
-    response->set_address(address->ToJson().dump());
+    response->set_address(address ? address->ToJson().dump() : std::string());
     return ::grpc::Status::OK;
 }