diff --git a/designateclient/cli/base.py b/designateclient/cli/base.py
index 8f1ad10..daa619e 100644
--- a/designateclient/cli/base.py
+++ b/designateclient/cli/base.py
@@ -32,6 +32,7 @@ class Command(CliffCommand):
         self.client = Client(
             region_name=self.app.options.os_region_name,
             service_type=self.app.options.os_service_type,
+            endpoint_type=self.app.options.os_endpoint_type,
             session=self.app.session,
             all_tenants=self.app.options.all_tenants,
             edit_managed=self.app.options.edit_managed,
diff --git a/designateclient/shell.py b/designateclient/shell.py
index f7c8be4..dcd4f06 100644
--- a/designateclient/shell.py
+++ b/designateclient/shell.py
@@ -146,7 +146,8 @@ class DesignateShell(App):
                                  'Defaults to env[OS_DNS_ENDPOINT].')
 
         parser.add_argument('--os-endpoint-type',
-                            default=env('OS_ENDPOINT_TYPE'),
+                            default=env('OS_ENDPOINT_TYPE',
+                                        default='publicURL'),
                             help='Defaults to env[OS_ENDPOINT_TYPE].')
 
         parser.add_argument('--os-service-type',