diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt
index 453f519953..d12ed929d4 100644
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -34,9 +34,6 @@ idf_build_get_property(build_dir BUILD_DIR)
 
 # ToDo: Rename esp32s2beta to esp32s2 next time update wifi lib
 set(target_name "${idf_target}")
-if(idf_target STREQUAL "esp32s2")
-    set(target_name "esp32s2beta")
-endif()
 target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}")
 
 if(link_binary_libs)
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 16036e13df..6b5e54a1f7 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 16036e13dfd924bbc9cc834a107c43939071d335
+Subproject commit 6b5e54a1f75c78fef093262373d4b8781ac9ad1f
diff --git a/components/esp_wifi/test_md5/test_md5.sh b/components/esp_wifi/test_md5/test_md5.sh
index 6a55239ce3..2c76c84457 100755
--- a/components/esp_wifi/test_md5/test_md5.sh
+++ b/components/esp_wifi/test_md5/test_md5.sh
@@ -19,7 +19,7 @@ case $IDF_TARGET in
         ;;
     esp32s2)
         PREFIX=xtensa-esp32s2-elf-
-        LIB_DIR=esp32s2beta
+        LIB_DIR=esp32s2
         ;;
     *)
         echo "Invalid IDF_TARGET value: \"${IDF_TARGET}\""