diff --git a/lib/orchlib/orchlib.cc b/lib/orchlib/orchlib.cc
index 9b9ddffb8..127084180 100644
--- a/lib/orchlib/orchlib.cc
+++ b/lib/orchlib/orchlib.cc
@@ -66,7 +66,7 @@ void start_server() {
 }
 
 void* orch_create_context(const char* server_addr) {
-  Client* client = new Client(grpc::CreateChannel("localhost:50052", grpc::InsecureChannelCredentials()));
+  Client* client = new Client(grpc::CreateChannel(server_addr, grpc::InsecureChannelCredentials()));
   client->RegisterWorker();
   return client;
 }