diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index f53e389..2149067 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -756,6 +756,10 @@ boolean WiFiManager::process(){
     #if defined(WM_MDNS) && defined(ESP8266)
     MDNS.update();
     #endif
+	
+    if(configPortalActive && !_configPortalIsBlocking){
+      if(configPortalHasTimeout()) shutdownConfigPortal();
+    }
 
     if(webPortalActive || (configPortalActive && !_configPortalIsBlocking)){
         uint8_t state = processConfigPortal();