diff --git a/heatclient/common/http.py b/heatclient/common/http.py
index 0a31496d..a9c981c0 100644
--- a/heatclient/common/http.py
+++ b/heatclient/common/http.py
@@ -347,6 +347,8 @@ def _construct_http_client(endpoint=None, username=None, password=None,
     auth = kwargs.pop('auth', None)
 
     if session:
+        if 'endpoint_override' not in kwargs and endpoint:
+            kwargs['endpoint_override'] = endpoint
         return SessionClient(session, auth=auth, **kwargs)
     else:
         return HTTPClient(endpoint=endpoint, username=username,