diff --git a/apps/emqx/src/emqx_persistent_session_ds/emqx_persistent_session_ds_shared_subs_null_agent.erl b/apps/emqx/src/emqx_persistent_session_ds/emqx_persistent_session_ds_shared_subs_null_agent.erl
index 4896fb01e..e158c19e2 100644
--- a/apps/emqx/src/emqx_persistent_session_ds/emqx_persistent_session_ds_shared_subs_null_agent.erl
+++ b/apps/emqx/src/emqx_persistent_session_ds/emqx_persistent_session_ds_shared_subs_null_agent.erl
@@ -37,7 +37,7 @@ on_unsubscribe(Agent, _TopicFilter) ->
     Agent.
 
 renew_streams(Agent) ->
-    {[], [], Agent}.
+    {[], Agent}.
 
 on_stream_progress(Agent, _StreamProgress) ->
     Agent.
diff --git a/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_leader_sup.erl b/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_leader_sup.erl
index 27978f07d..d511fde24 100644
--- a/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_leader_sup.erl
+++ b/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_leader_sup.erl
@@ -41,7 +41,7 @@ start_leader(Options) ->
     ChildSpec = emqx_ds_shared_sub_leader:child_spec(Options),
     supervisor:start_child(?MODULE, ChildSpec).
 
--spec stop_leader(emqx_ds_shared_sub_leader:topic_filter()) -> ok | {error, term()}.
+-spec stop_leader(emqx_persistent_session_ds:share_topic_filter()) -> ok | {error, term()}.
 stop_leader(TopicFilter) ->
     supervisor:terminate_child(?MODULE, emqx_ds_shared_sub_leader:id(TopicFilter)).
 
diff --git a/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_registry.erl b/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_registry.erl
index 70746264a..d2d0c1747 100644
--- a/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_registry.erl
+++ b/apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_registry.erl
@@ -25,7 +25,7 @@
 ]).
 
 -record(lookup_leader, {
-    agent :: emqx_ds_shared_sub:agent(),
+    agent :: emqx_ds_shared_sub_proto:agent(),
     topic_filter :: emqx_persistent_session_ds:share_topic_filter()
 }).
 
@@ -33,6 +33,9 @@
 %% API
 %%--------------------------------------------------------------------
 
+-spec lookup_leader(
+    emqx_ds_shared_sub_proto:agent(), emqx_persistent_session_ds:share_topic_filter()
+) -> ok.
 lookup_leader(Agent, TopicFilter) ->
     gen_server:cast(?MODULE, #lookup_leader{agent = Agent, topic_filter = TopicFilter}).