diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
index a359f03d2..2551f9d0d 100644
--- a/NEXT_CHANGELOG.md
+++ b/NEXT_CHANGELOG.md
@@ -5,10 +5,13 @@
 ### New Features and Improvements
 
 ### Bug Fixes
+
 - Improving the error message that is shown when the unsupported `dbutils.credentials.getServiceCredentialsProvider` method is used. This method can only be used inside of a notebook.
 
 ### Documentation
 
 ### Internal Changes
 
+- Use the `Config`'s `retry_timeout_seconds` when fetching account and workspace endpoints
+
 ### API Changes
diff --git a/databricks/sdk/config.py b/databricks/sdk/config.py
index 879ba64ec..fa2425781 100644
--- a/databricks/sdk/config.py
+++ b/databricks/sdk/config.py
@@ -11,7 +11,7 @@
 import requests
 
 from . import useragent
-from ._base_client import _fix_host_if_needed
+from ._base_client import _BaseClient, _fix_host_if_needed
 from .clock import Clock, RealClock
 from .credentials_provider import (CredentialsStrategy, DefaultCredentials,
                                    OAuthCredentialsProvider)
@@ -392,8 +392,12 @@ def oidc_endpoints(self) -> Optional[OidcEndpoints]:
         if self.is_azure and self.azure_client_id:
             return get_azure_entra_id_workspace_endpoints(self.host)
         if self.is_account_client and self.account_id:
-            return get_account_endpoints(self.host, self.account_id)
-        return get_workspace_endpoints(self.host)
+            return get_account_endpoints(
+                self.host,
+                self.account_id,
+                client=_BaseClient(retry_timeout_seconds=self.retry_timeout_seconds)
+            )
+        return get_workspace_endpoints(self.host, client=_BaseClient(retry_timeout_seconds=self.retry_timeout_seconds))
 
     def debug_string(self) -> str:
         """Returns log-friendly representation of configured attributes"""