diff --git a/cinderclient/v1/shell.py b/cinderclient/v1/shell.py
index 21ee747..2c06e67 100644
--- a/cinderclient/v1/shell.py
+++ b/cinderclient/v1/shell.py
@@ -655,7 +655,7 @@ def do_type_key(cs, args):
 def do_endpoints(cs, args):
     """Discovers endpoints registered by authentication service."""
     catalog = cs.client.service_catalog.catalog
-    for e in catalog['serviceCatalog']:
+    for e in catalog:
         utils.print_dict(e['endpoints'][0], e['name'])
 
 
diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index 2f89005..922e3f8 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -1035,7 +1035,7 @@ def do_type_access_remove(cs, args):
 def do_endpoints(cs, args):
     """Discovers endpoints registered by authentication service."""
     catalog = cs.client.service_catalog.catalog
-    for e in catalog['serviceCatalog']:
+    for e in catalog:
         utils.print_dict(e['endpoints'][0], e['name'])