diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index 6f74493c078..2825eb9e49c 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -87,6 +87,8 @@ def async_aiohttp_proxy_stream(hass, request, stream_coro, buffer_size=102400,
 
         while True:
             data = yield from stream.content.read(buffer_size)
+            if not data:
+                break
             response.write(data)
 
     except asyncio.TimeoutError: