diff --git a/src/runloop_api_client/lib/wait_for_status.py b/src/runloop_api_client/lib/wait_for_status.py
index 73df2bf95..cb7bb9193 100644
--- a/src/runloop_api_client/lib/wait_for_status.py
+++ b/src/runloop_api_client/lib/wait_for_status.py
@@ -14,7 +14,7 @@
 from typing import List, Type, TypeVar, Callable, Optional, Awaitable
 
 from .polling import PollingConfig, PollingTimeout
-from .._exceptions import APIStatusError, APITimeoutError
+from .._exceptions import APIStatusError, APIConnectionError
 
 T = TypeVar("T")
 
@@ -49,8 +49,8 @@ def wait_for_status(
                 cast_to=cast_to,
                 options={"max_retries": 0},
             )
-        except (APITimeoutError, APIStatusError) as error:
-            if isinstance(error, APITimeoutError) or error.response.status_code == 408:
+        except (APIConnectionError, APIStatusError) as error:
+            if isinstance(error, APIConnectionError) or error.response.status_code == 408:
                 last_result = placeholder()
             else:
                 raise
@@ -89,8 +89,8 @@ async def async_wait_for_status(
                 cast_to=cast_to,
                 options={"max_retries": 0},
             )
-        except (APITimeoutError, APIStatusError) as error:
-            if isinstance(error, APITimeoutError) or error.response.status_code == 408:
+        except (APIConnectionError, APIStatusError) as error:
+            if isinstance(error, APIConnectionError) or error.response.status_code == 408:
                 last_result = placeholder()
             else:
                 raise
diff --git a/src/runloop_api_client/resources/devboxes/devboxes.py b/src/runloop_api_client/resources/devboxes/devboxes.py
index ec9f8eaf8..9a9ab288a 100644
--- a/src/runloop_api_client/resources/devboxes/devboxes.py
+++ b/src/runloop_api_client/resources/devboxes/devboxes.py
@@ -71,7 +71,7 @@
     SyncDiskSnapshotsCursorIDPage,
     AsyncDiskSnapshotsCursorIDPage,
 )
-from ..._exceptions import RunloopError, APIStatusError, APITimeoutError
+from ..._exceptions import RunloopError, APIStatusError, APIConnectionError
 from ...lib.polling import PollingConfig, poll_until
 from ..._base_client import AsyncPaginator, make_request_options
 from .disk_snapshots import (
@@ -957,7 +957,7 @@ def execute_and_await_completion(
             return execution
 
         def handle_timeout_error(error: Exception) -> DevboxAsyncExecutionDetailView:
-            if isinstance(error, APITimeoutError) or (
+            if isinstance(error, APIConnectionError) or (
                 isinstance(error, APIStatusError) and error.response.status_code == 408
             ):
                 return execution
@@ -2627,7 +2627,7 @@ async def execute_and_await_completion(
             return execution
 
         def handle_timeout_error(error: Exception) -> DevboxAsyncExecutionDetailView:
-            if isinstance(error, APITimeoutError) or (
+            if isinstance(error, APIConnectionError) or (
                 isinstance(error, APIStatusError) and error.response.status_code == 408
             ):
                 return execution