diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index c21374f..838b45a 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -2445,7 +2445,7 @@ void WiFiManager::WiFiEvent(WiFiEvent_t event,system_event_info_t info){
 void WiFiManager::WiFi_autoReconnect(){
   #ifdef ESP8266
     WiFi.setAutoReconnect(_wifiAutoReconnect);
-  #elif defined(ESP32)
+  #elif defined(ESP32) && defined(esp32autoreconnect)
     if(_wifiAutoReconnect){
       DEBUG_WM(DEBUG_VERBOSE,"ESP32 event handler enabled");
       WiFi.onEvent(WiFiEvent);
diff --git a/WiFiManager.h b/WiFiManager.h
index 795f67d..99f4330 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -22,6 +22,9 @@
 
 // #include "soc/efuse_reg.h" // include to add efuse chip rev to info, getChipRevision() is almost always the same though, so not sure why it matters.
 
+// #define esp32autoreconnect    // implement esp32 autoreconnect event listener kludge
+// autoreconnect status WORKING https://github.com/espressif/arduino-esp32/issues/653#issuecomment-405604766
+
 #define WM_WEBSERVERSHIM      // use webserver shim lib
 
 #ifdef ESP8266