diff --git a/lib/NetworkUtils/NetworkMgr.h b/lib/NetworkUtils/NetworkMgr.h
index 0415216..2369005 100644
--- a/lib/NetworkUtils/NetworkMgr.h
+++ b/lib/NetworkUtils/NetworkMgr.h
@@ -182,9 +182,9 @@ namespace NetworkUtils {
 
       wifi_station_dhcpc_set_maxtry(5);
       #endif
-
-      #ifdef ARDUINO_ARCH_ESP32
-      // Nothing. Because memory leaks when turn off WiFi on ESP32, bug?
+      
+      #if defined(ARDUINO_ARCH_ESP32) && ESP_ARDUINO_VERSION_MAJOR < 3
+      // Nothing. Because memory leaks when turn off WiFi on ESP32 SDK < 3.0.0
       return true;
       #else
       return WiFi.mode(WIFI_OFF);
diff --git a/src/defines.h b/src/defines.h
index 0271e89..74908cb 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -123,7 +123,9 @@
   #define PROGMEM 
 #endif
 
-#ifndef GPIO_IS_VALID_GPIO
+#ifdef ARDUINO_ARCH_ESP32
+  #include <driver/gpio.h>
+#elif !defined(GPIO_IS_VALID_GPIO)
   #define GPIO_IS_VALID_GPIO(gpioNum) (gpioNum >= 0 && gpioNum <= 16)
 #endif