diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 5afe902..1288c8f 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -2086,13 +2086,11 @@ String WiFiManager::getInfoData(String id){
       p.replace(FPSTR(T_1),WiFi.softAPgetHostname());
   }
   #endif
-  // #ifdef ESP8266
   #ifndef WM_NOSOFTAPSSID
   else if(id==F("apssid")){
     p = FPSTR(HTTP_INFO_apssid);
     p.replace(FPSTR(T_1),htmlEntities(WiFi.softAPSSID()));
   }
-  // #endif
   #endif
   else if(id==F("apbssid")){
     p = FPSTR(HTTP_INFO_apbssid);
diff --git a/WiFiManager.h b/WiFiManager.h
index 75c5542..8022005 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -594,10 +594,15 @@ class WiFiManager
 
     // check for arduino or system event system, handle esp32 arduino v2 and IDF
     #if defined(ESP_ARDUINO_VERSION) && defined(ESP_ARDUINO_VERSION_VAL)
-    #define WM_ARDUINOVERCHECK ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
-    #ifdef WM_ARDUINOVERCHECK
-    #define WM_ARDUINOEVENTS
-    #endif
+
+        #define WM_ARDUINOVERCHECK ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
+
+        #ifdef WM_ARDUINOVERCHECK
+            #define WM_ARDUINOEVENTS
+        #else
+            #define WM_NOSOFTAPSSID
+        #endif
+    
     #endif
 
     #ifdef WM_ARDUINOEVENTS