diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index e4a46743b..9d6327253 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -29,7 +29,7 @@
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}},
     {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.1"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
-    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.35.3"}}},
+    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.36.0"}}},
     {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
     {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},
     {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.0"}}}
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 7000ffe0a..bb4520aa9 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -872,12 +872,6 @@ fields("mqtt_quic_listener") ->
                 ?MAX_UINT(64),
                 ?DESC(fields_mqtt_quic_listener_max_bytes_per_key)
             )},
-        {"handshake_idle_timeout_ms",
-            quic_lowlevel_settings_uint(
-                1,
-                ?MAX_UINT(64),
-                ?DESC(fields_mqtt_quic_listener_handshake_idle_timeout)
-            )},
         {"tls_server_max_send_buffer",
             quic_lowlevel_settings_uint(
                 1,
diff --git a/changes/ce/feat-10019.zh.md b/changes/ce/feat-10019.zh.md
index 9ef671b3d..b0eb2a673 100644
--- a/changes/ce/feat-10019.zh.md
+++ b/changes/ce/feat-10019.zh.md
@@ -1 +1 @@
-为 QUIC 侦听器添加更多底层调优选项。
+为 QUIC 监听器添加更多底层调优选项。
diff --git a/changes/ce/fix-10037.en.md b/changes/ce/fix-10037.en.md
new file mode 100644
index 000000000..73c92d69d
--- /dev/null
+++ b/changes/ce/fix-10037.en.md
@@ -0,0 +1,2 @@
+Fix Swagger API doc rendering crash.
+In version 5.0.18, a bug was introduced that resulted in duplicated field names in the configuration schema. This, in turn, caused the Swagger schema generated to become invalid.
diff --git a/changes/ce/fix-10037.zh.md b/changes/ce/fix-10037.zh.md
new file mode 100644
index 000000000..5bd447c1f
--- /dev/null
+++ b/changes/ce/fix-10037.zh.md
@@ -0,0 +1,2 @@
+修复 Swagger API 文档渲染崩溃。
+在版本 5.0.18 中，引入了一个错误，导致配置 schema 中出现了重复的配置名称，进而导致生成了无效的 Swagger spec。
diff --git a/mix.exs b/mix.exs
index 43b0c979f..6c5ed2599 100644
--- a/mix.exs
+++ b/mix.exs
@@ -69,7 +69,7 @@ defmodule EMQXUmbrella.MixProject do
       # in conflict by emqtt and hocon
       {:getopt, "1.0.2", override: true},
       {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.0", override: true},
-      {:hocon, github: "emqx/hocon", tag: "0.35.3", override: true},
+      {:hocon, github: "emqx/hocon", tag: "0.36.0", override: true},
       {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.2", override: true},
       {:esasl, github: "emqx/esasl", tag: "0.2.0"},
       {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
diff --git a/rebar.config b/rebar.config
index 816118926..05697b96d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -69,7 +69,7 @@
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}
     , {getopt, "1.0.2"}
     , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.0"}}}
-    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.35.3"}}}
+    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.36.0"}}}
     , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}
     , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
     , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}