diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 584c131..bec013a 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -178,10 +178,10 @@ void WiFiManager::stopWebPortal() {
 }
 
 boolean WiFiManager::configPortalHasTimeout(){
-    if(_configPortalTimeout == 0 ){ //|| wifi_softap_get_station_num() > 0){
+    if(_configPortalTimeout == 0 || WiFi_softap_num_stations() > 0){
       if(millis() - timer > 30000){
         timer = millis();
-        // DEBUG_WM("NUM CLIENTS: " + (String)wifi_softap_get_station_num());
+        DEBUG_WM("NUM CLIENTS: " + (String)WiFi_softap_num_stations());
       }
       _configPortalStart = millis(); // kludge, bump configportal start time to skew timeouts
       return false;
@@ -1473,4 +1473,12 @@ bool WiFiManager::WiFi_eraseConfig(void) {
 
 void WiFiManager::reboot(){
   ESP.restart();
+}
+
+uint8_t WiFiManager::WiFi_softap_num_stations(){
+  #ifdef ESP8266
+    return wifi_softap_get_station_num();
+  #elif defined(ESP31B) || defined(ESP32)
+    return WiFi.softAPgetStationNum();
+  #endif
 }
\ No newline at end of file
diff --git a/WiFiManager.h b/WiFiManager.h
index 45a0e37..ee7d805 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -253,7 +253,8 @@ class WiFiManager
     bool          WiFi_enableSTA(bool enable,bool persistent);
     bool          WiFi_eraseConfig();
     void          debugSoftAPConfig();
-
+    uint8_t       WiFi_softap_num_stations();
+    
     String        getParamOut();
     String        getScanItemOut();
     String        getStaticOut();