diff --git a/aioesphomeapi/client.py b/aioesphomeapi/client.py
index e8dc3a81..9f6187f3 100644
--- a/aioesphomeapi/client.py
+++ b/aioesphomeapi/client.py
@@ -531,7 +531,7 @@ def unsub() -> None:
             # to avoid race were we run out even though we have a slot.
             await self.bluetooth_device_disconnect(address)
             raise TimeoutAPIError(
-                f"Timeout waiting for connect response while connecting to {to_human_readable_address(address)}"
+                f"Timeout waiting for connect response while connecting to {to_human_readable_address(address)} after {timeout}s"
             ) from err
 
         return unsub
@@ -613,7 +613,7 @@ async def bluetooth_gatt_write(
         handle: int,
         data: bytes,
         response: bool,
-        timeout: float = 10.0,
+        timeout: float = DEFAULT_BLE_TIMEOUT,
     ) -> None:
         req = BluetoothGATTWriteRequest()
         req.address = address
@@ -656,7 +656,7 @@ async def bluetooth_gatt_write_descriptor(
         address: int,
         handle: int,
         data: bytes,
-        timeout: float = 10.0,
+        timeout: float = DEFAULT_BLE_TIMEOUT,
     ) -> None:
         req = BluetoothGATTWriteDescriptorRequest()
         req.address = address
diff --git a/aioesphomeapi/connection.py b/aioesphomeapi/connection.py
index ef7ad8fb..44420637 100644
--- a/aioesphomeapi/connection.py
+++ b/aioesphomeapi/connection.py
@@ -469,7 +469,7 @@ def on_read_exception(exc: Exception) -> None:
                 await fut
         except asyncio.TimeoutError as err:
             raise TimeoutAPIError(
-                f"Timeout waiting for response for {type(send_msg)}"
+                f"Timeout waiting for response for {type(send_msg)} after {timeout}s"
             ) from err
         finally:
             with suppress(ValueError):