diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 6ee5313b9b..90cd734bf1 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -508,5 +508,14 @@ config ESP32_PHY_MAX_TX_POWER
 	help
 		Set maximum transmit power. Actual transmit power for high
 		data rates may be lower than this setting.
+		
+config ESP32_WIFI_RX_BUFFER_NUM
+	int "Max number of WiFi RX buffers"
+	range 2 25
+	default 25
+	help
+		Set the number of WiFi rx buffers. Each buffer takes approximately 1.6KB of RAM.
+		Larger number for higher throughput but more memory. Smaller number for lower 
+		throughput but less memory.	
 
 endmenu
diff --git a/components/esp32/include/esp_wifi.h b/components/esp32/include/esp_wifi.h
index ac49764f1f..c835c071c7 100755
--- a/components/esp32/include/esp_wifi.h
+++ b/components/esp32/include/esp_wifi.h
@@ -94,11 +94,13 @@ extern "C" {
  */
 typedef struct {
     system_event_handler_t event_handler;  /**< WiFi event handler */
+    uint32_t rx_buf_num;  /**< WiFi RX buffer number */
 } wifi_init_config_t;
 
 
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .event_handler = &esp_event_send, \
+    .rx_buf_num = CONFIG_ESP32_WIFI_RX_BUFFER_NUM, \
 };
 
 /**
diff --git a/components/esp32/lib b/components/esp32/lib
index edad974840..21e433b827 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit edad9748406d06bfd2dfba6cf1a0735c3982460f
+Subproject commit 21e433b8277adc1d65894ec0a65c60f78dc84f7c