diff --git a/src/HttpClient.cpp b/src/HttpClient.cpp
index 2c6d941..8a5b5c9 100644
--- a/src/HttpClient.cpp
+++ b/src/HttpClient.cpp
@@ -650,12 +650,9 @@ int HttpClient::available()
 
 int HttpClient::read()
 {
-    if (iState == eReadingBodyChunk)
+    if (iIsChunked && !available())
     {
-        if (!available())
-        {
-            return -1;
-        }
+        return -1;
     }
 
     int ret = iClient->read();