diff --git a/src/py42/services/orgs.py b/src/py42/services/orgs.py
index 79ee0abe..967a7d69 100644
--- a/src/py42/services/orgs.py
+++ b/src/py42/services/orgs.py
@@ -28,9 +28,10 @@ def org_id_map(self):
         """Map org guids to ids."""
         if not self._org_id_map:
             self._org_id_map = {}
-            page = self.get_page()
-            for org in page["orgs"]:
-                self._org_id_map[org["orgId"]] = org["orgGuid"]
+            pages = self.get_all()
+            for page in pages:
+                for org in page.data["orgs"]:
+                    self._org_id_map[org["orgId"]] = org["orgGuid"]
         return self._org_id_map
 
     def create_org(self, org_name, org_ext_ref=None, notes=None, parent_org_uid=None):
@@ -287,13 +288,12 @@ def _get_guid_by_id(self, org_id, id_key="orgId"):
         # Use additional lookup to prevent breaking changes.
 
         if id_key != "orgId":
-            guid = ""
-            page = self.get_page()
-            for org in page["orgs"]:
-                if org[id_key] == org_id:
-                    return org["orgGuid"]
-            if not guid:
-                raise Py42Error(f"Couldn't find an Org with ID '{org_id}'.")
+            pages = self.get_all()
+            for page in pages:
+                for org in page.data["orgs"]:
+                    if org[id_key] == org_id:
+                        return org["orgGuid"]
+            raise Py42Error(f"Couldn't find an Org with {id_key} '{org_id}'.")
         else:
             try:
                 return self.org_id_map[org_id]