diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index b416ac2..d0c278a 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -909,7 +909,7 @@ uint8_t WiFiManager::connectWifi(String ssid, String pass) {
   if(_cleanConnect) WiFi_Disconnect(); // disconnect before begin, in case anything is hung, this causes a 2 seconds delay for connect
   // @todo find out what status is when this is needed, can we detect it and handle it, say in between states or idle_status
 
-  while(retry <= _connectRetries){
+  while(retry <= _connectRetries && (connRes!=WL_CONNECTED)){
   if(_connectRetries > 1){
     #ifdef WM_DEBUG_LEVEL
       DEBUG_WM(F("Connect Wifi, ATTEMPT #"),(String)retry+" of "+(String)_connectRetries);