diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
index 17831d3b..cbe6aa8f 100644
--- a/libraries/WiFi/src/WiFiClient.cpp
+++ b/libraries/WiFi/src/WiFiClient.cpp
@@ -23,6 +23,7 @@
 #include <lwip/netdb.h>
 #include <errno.h>
 
+#define WIFI_CLIENT_DEF_CONN_TIMEOUT  (3)
 #define WIFI_CLIENT_MAX_WRITE_RETRY   (10)
 #define WIFI_CLIENT_SELECT_TIMEOUT_US (1000000)
 #define WIFI_CLIENT_FLUSH_BUFFER_SIZE (1024)
@@ -207,7 +208,7 @@ void WiFiClient::stop()
 
 int WiFiClient::connect(IPAddress ip, uint16_t port)
 {
-    return connect(ip,port,-1);
+    return connect(ip,port,WIFI_CLIENT_DEF_CONN_TIMEOUT);
 }
 int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout)
 {
@@ -278,7 +279,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout)
 
 int WiFiClient::connect(const char *host, uint16_t port)
 {
-    return connect(host,port,-1);
+    return connect(host,port,WIFI_CLIENT_DEF_CONN_TIMEOUT);
 }
 int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout)
 {