diff --git a/CHANGELOG.md b/CHANGELOG.md
index f992d40f..87c2321d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ nylas-python Changelog
 Unreleased
 ----------------
 * Improved message sending and draft create/update performance
+* Change default timeout to match API (90 seconds)
 
 v6.1.0
 ----------------
diff --git a/nylas/client.py b/nylas/client.py
index 6ce8e9b5..00b5ad8c 100644
--- a/nylas/client.py
+++ b/nylas/client.py
@@ -26,7 +26,7 @@ class Client:
     """
 
     def __init__(
-        self, api_key: str, api_uri: str = DEFAULT_SERVER_URL, timeout: int = 30
+        self, api_key: str, api_uri: str = DEFAULT_SERVER_URL, timeout: int = 90
     ):
         """
         Initialize the Nylas API client.
diff --git a/tests/test_client.py b/tests/test_client.py
index 139874d8..3fd84b67 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -33,7 +33,7 @@ def test_client_init_defaults(self):
 
         assert client.api_key == "test-key"
         assert client.api_uri == "https://api.us.nylas.com"
-        assert client.http_client.timeout == 30
+        assert client.http_client.timeout == 90
 
     def test_client_auth_property(self, client):
         assert client.auth is not None