diff --git a/apps/emqx/src/emqx_limiter/src/emqx_limiter_manager.erl b/apps/emqx/src/emqx_limiter/src/emqx_limiter_manager.erl
index 4888368e0..efd89236b 100644
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_manager.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_manager.erl
@@ -135,7 +135,7 @@ start_link() ->
     | {stop, Reason :: term()}
     | ignore.
 init([]) ->
-    emqx_conf:add_handler([limiter], ?MODULE),
+    ok = emqx_config_handler:add_handler([limiter], ?MODULE),
     _ = ets:new(?TAB, [
         set,
         public,
@@ -210,7 +210,7 @@ handle_info(Info, State) ->
     State :: term()
 ) -> any().
 terminate(_Reason, _State) ->
-    emqx_conf:remove_handler([limiter]),
+    emqx_config_handler:remove_handler([limiter]),
     ok.
 
 %%--------------------------------------------------------------------
diff --git a/apps/emqx_retainer/test/emqx_retainer_SUITE.erl b/apps/emqx_retainer/test/emqx_retainer_SUITE.erl
index f207bdd04..953752788 100644
--- a/apps/emqx_retainer/test/emqx_retainer_SUITE.erl
+++ b/apps/emqx_retainer/test/emqx_retainer_SUITE.erl
@@ -359,7 +359,7 @@ t_flow_control(_) ->
             }
     },
     emqx_config:put([limiter, batch, bucket, retainer], RetainerCfg2),
-    emqx_limiter_manager:restart_server(shared),
+    emqx_limiter_manager:restart_server(batch),
     timer:sleep(500),
 
     emqx_retainer_dispatcher:refresh_limiter(),
@@ -408,7 +408,7 @@ t_flow_control(_) ->
 
     %% recover the limiter
     emqx_config:put([limiter, batch, bucket, retainer], RetainerCfg),
-    emqx_limiter_manager:restart_server(shared),
+    emqx_limiter_manager:restart_server(batch),
     timer:sleep(500),
 
     emqx_retainer_dispatcher:refresh_limiter(),