diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
index 5e641a678..6aebf1f6c 100644
--- a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -228,8 +228,7 @@ bool WiFiClientSecure::_clientConnected() {
 }
 
 uint8_t WiFiClientSecure::connected() {
-  if (WiFiClient::connected() || available() ||
-      (_clientConnected() && _handshake_done)) {
+  if (available() || (_clientConnected() && _handshake_done)) {
     return true;
   }
   return false;
@@ -398,7 +397,7 @@ int WiFiClientSecure::_run_until(unsigned target, bool blocking) {
     }
 
     if (!(_client->state() == ESTABLISHED) && !WiFiClient::available()) {
-      return -1;
+      return (state & target) ? 0 : -1;
     }
 
     /*