diff --git a/src/a2a/client/transports/jsonrpc.py b/src/a2a/client/transports/jsonrpc.py
index 868b3a018..bfba09d71 100644
--- a/src/a2a/client/transports/jsonrpc.py
+++ b/src/a2a/client/transports/jsonrpc.py
@@ -147,7 +147,12 @@ async def send_message_streaming(
             context,
         )
 
-        modified_kwargs.setdefault('timeout', None)
+        modified_kwargs.setdefault(
+            'timeout', self.httpx_client.timeout.as_dict().get('read', None)
+        )
+        headers = dict(self.httpx_client.headers.items())
+        headers.update(modified_kwargs.get('headers', {}))
+        modified_kwargs['headers'] = headers
 
         async with aconnect_sse(
             self.httpx_client,