diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
index dd97cdd02..354103a7e 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -302,22 +302,11 @@ void WiFiClient::stopAll()
 }
 
 
-void WiFiClient::stopAllexcepted(WiFiClient * exC) {
+void WiFiClient::stopAllExcept(WiFiClient * exC) {
     for (WiFiClient* it = _s_first; it; it = it->_next) {
         ClientContext* c = it->_client;
 
-        if(c && exC->_client) {
-            if(exC->_client->getRemoteAddress() == c->getRemoteAddress()) {
-                if(exC->_client->getRemotePort() == c->getRemotePort()) {
-                    if(exC->_client->getLocalPort() == c->getLocalPort()) {
-                        // ignore this
-                        c = NULL;
-                    }
-                }
-            }
-        }
-
-        if (c) {
+        if (c && c != exC->_client) {
             c->abort();
             c->unref();
             it->_client = 0;
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.h b/libraries/ESP8266WiFi/src/WiFiClient.h
index 542b05d31..8d8cab10f 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.h
+++ b/libraries/ESP8266WiFi/src/WiFiClient.h
@@ -93,7 +93,7 @@ public:
   using Print::write;
 
   static void stopAll();
-  static void stopAllexcepted(WiFiClient * c);
+  static void stopAllExcept(WiFiClient * c);
 
 private:
 
diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
index 3964415ba..e4e062ff0 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -130,7 +130,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port,
                 } else {
 
                     WiFiUDP::stopAll();
-                    WiFiClient::stopAllexcepted(&tcp);
+                    WiFiClient::stopAllExcept(&tcp);
 
                     delay(100);