diff --git a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl
index efc2d2fbb..c13f1ecc9 100644
--- a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl
+++ b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl
@@ -222,10 +222,5 @@ format_msg(Message)
 format_msg(Message) when is_tuple(Message) ->
     iolist_to_binary(io_lib:format("~p", [Message])).
 
--if(?OTP_RELEASE >= 23).
 urldecode(S) ->
-    [{R, _}] = uri_string:dissect_query(S), R.
--else.
-urldecode(S) ->
-    http_uri:decode(S).
--endif.
+    emqx_http_lib:uri_decode(S).
diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
index 049af79ad..4336cb643 100644
--- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
@@ -301,10 +301,5 @@ format_msg(Message)
 format_msg(Message) when is_tuple(Message) ->
     iolist_to_binary(io_lib:format("~p", [Message])).
 
--if(?OTP_RELEASE >= 23).
 urldecode(S) ->
-    [{R, _}] = uri_string:dissect_query(S), R.
--else.
-urldecode(S) ->
-    http_uri:decode(S).
--endif.
+    emqx_http_lib:uri_decode(S).
diff --git a/apps/emqx_management/src/emqx_mgmt_util.erl b/apps/emqx_management/src/emqx_mgmt_util.erl
index 7c6ce4ef9..e18345a55 100644
--- a/apps/emqx_management/src/emqx_mgmt_util.erl
+++ b/apps/emqx_management/src/emqx_mgmt_util.erl
@@ -74,11 +74,6 @@ merge_maps(Default, New) ->
         end
     end, Default, New).
 
--if(?OTP_RELEASE >= 23).
 urldecode(S) ->
-    [{R, _}] = uri_string:dissect_query(S), R.
--else.
-urldecode(S) ->
-    http_uri:decode(S).
--endif.
+    emqx_http_lib:uri_decode(S).
 
diff --git a/apps/emqx_sasl/src/emqx_sasl_api.erl b/apps/emqx_sasl/src/emqx_sasl_api.erl
index 1f77cd9e7..22b33975b 100644
--- a/apps/emqx_sasl/src/emqx_sasl_api.erl
+++ b/apps/emqx_sasl/src/emqx_sasl_api.erl
@@ -223,11 +223,5 @@ pipeline([Fun | More], Params) ->
             {error, Reason}
     end.
 
--if(?OTP_RELEASE >= 23).
 urldecode(S) ->
-    [{R, _}] = uri_string:dissect_query(S), R.
--else.
-urldecode(S) ->
-    http_uri:decode(S).
--endif.
-
+    emqx_http_lib:uri_decode(S).