diff --git a/pytec/pytec/aioclient.py b/pytec/pytec/aioclient.py
index ca674d4..3aa9b7b 100644
--- a/pytec/pytec/aioclient.py
+++ b/pytec/pytec/aioclient.py
@@ -15,6 +15,7 @@ class Client:
         self._connecting_task = None
         self._command_lock = asyncio.Lock()
         self._report_mode_on = False
+        self.timeout = None
 
     async def connect(self, host='192.168.1.26', port=23, timeout=None):
         """Connect to the Thermostat with host and port.
@@ -31,6 +32,7 @@ class Client:
         self._connecting_task = asyncio.create_task(
             asyncio.wait_for(asyncio.open_connection(host, port), timeout)
         )
+        self.timeout = timeout
         try:
             self._reader, self._writer = await self._connecting_task
         except asyncio.CancelledError:
@@ -71,7 +73,7 @@ class Client:
 
     async def _read_line(self):
         # read 1 line
-        chunk = await self._reader.readline()
+        chunk = await asyncio.wait_for(self._reader.readline(), self.timeout) # Only wait for response until timeout
         return chunk.decode('utf-8', errors='ignore')
 
     async def _read_write(self, command):