diff --git a/aw_client/client.py b/aw_client/client.py
index 66d47d4..7322bf4 100644
--- a/aw_client/client.py
+++ b/aw_client/client.py
@@ -88,9 +88,10 @@ def __init__(
 
         server_host = host or server_config["hostname"]
         server_port = port or server_config["port"]
-        self.server_address = "{protocol}://{host}:{port}".format(
+        default_server_address = "{protocol}://{host}:{port}".format(
             protocol=protocol, host=server_host, port=server_port
         )
+        self.server_address = server_config.get("endpoint") or default_server_address
 
         self.instance = SingleInstance(
             f"{self.client_name}-at-{server_host}-on-{server_port}"