diff --git a/components/asio/asio b/components/asio/asio
index 55efc179b..3b66e5b05 160000
--- a/components/asio/asio
+++ b/components/asio/asio
@@ -1 +1 @@
-Subproject commit 55efc179b76139c8f9b44bf22a4aba4803f7a7bd
+Subproject commit 3b66e5b051381fb70de9c2791df70a06181c64e3
diff --git a/components/asio/port/include/esp_asio_config.h b/components/asio/port/include/esp_asio_config.h
index f8617fcc9..750f4cbe3 100644
--- a/components/asio/port/include/esp_asio_config.h
+++ b/components/asio/port/include/esp_asio_config.h
@@ -22,8 +22,12 @@
 #  define ASIO_NO_EXCEPTIONS
 # endif   // CONFIG_COMPILER_CXX_EXCEPTIONS
 
+# ifndef CONFIG_COMPILER_RTTI
+#  define ASIO_NO_TYPEID
+# endif   // CONFIG_COMPILER_RTTI
+
 //
-// LWIP compatifility inet and address macros/functions
+// LWIP compatibility inet and address macros/functions
 //
 # define LWIP_COMPAT_SOCKET_INET 1
 # define LWIP_COMPAT_SOCKET_ADDR 1
@@ -34,12 +38,6 @@
 # define ASIO_DISABLE_SERIAL_PORT
 # define ASIO_SEPARATE_COMPILATION
 # define ASIO_STANDALONE
-# define ASIO_NO_TYPEID
-# define ASIO_DISABLE_SIGNAL
 # define ASIO_HAS_PTHREADS
-# define ASIO_DISABLE_EPOLL
-# define ASIO_DISABLE_EVENTFD
-# define ASIO_DISABLE_SIGNAL
-# define ASIO_DISABLE_SIGACTION
 
 #endif // _ESP_ASIO_CONFIG_H_
diff --git a/docs/en/api-reference/protocols/asio.rst b/docs/en/api-reference/protocols/asio.rst
index 635ef053f..dcf704131 100644
--- a/docs/en/api-reference/protocols/asio.rst
+++ b/docs/en/api-reference/protocols/asio.rst
@@ -15,18 +15,17 @@ Supported features
 ^^^^^^^^^^^^^^^^^^
 ESP platform port currently supports only network asynchronous socket operations; does not support serial port and ssl.
 Internal asio settings for ESP include
-- EXCEPTIONS: Supported, choice in menuconfig
-- SIGNAL, SIGACTION: Not supported
-- EPOLL, EVENTFD: Not supported
-- TYPEID: Disabled by default, but supported in toolchain and asio (provided stdlib recompiled with -frtti)
+
+- EXCEPTIONS are enabled in ASIO if enabled in menuconfig
+- TYPEID is enabled in ASIO if enabled in menuconfig
 
 Application Example
 -------------------
-ESP examples are based on standard asio examples `examples/protocols/asio`:
-- udp_echo_server
-- tcp_echo_server
-- chat_client
-- chat_server
+ESP examples are based on standard asio :example:`examples/protocols/asio`:
+
+- :example:`examples/protocols/asio/udp_echo_server`
+- :example:`examples/protocols/asio/tcp_echo_server`
+- :example:`examples/protocols/asio/chat_client`
+- :example:`examples/protocols/asio/chat_server`
+
 Please refer to the specific example README.md for details
-
-