diff --git a/src/emqx_broker_helper.erl b/src/emqx_broker_helper.erl
index c8e2b5eab..1ea3f3668 100644
--- a/src/emqx_broker_helper.erl
+++ b/src/emqx_broker_helper.erl
@@ -31,7 +31,7 @@
 -define(SUBSEQ, emqx_subseq).
 -define(SHARD, 1024).
 
--define(BATCH_SIZE, 10000).
+-define(BATCH_SIZE, 100000).
 
 -spec(start_link() -> emqx_types:startlink_ret()).
 start_link() ->
diff --git a/src/emqx_cm.erl b/src/emqx_cm.erl
index 62cb417de..b8a57bc50 100644
--- a/src/emqx_cm.erl
+++ b/src/emqx_cm.erl
@@ -42,7 +42,7 @@
 -define(CONN_ATTRS_TAB, emqx_conn_attrs).
 -define(CONN_STATS_TAB, emqx_conn_stats).
 
--define(BATCH_SIZE, 10000).
+-define(BATCH_SIZE, 100000).
 
 %% @doc Start the connection manager.
 -spec(start_link() -> emqx_types:startlink_ret()).
diff --git a/src/emqx_sm.erl b/src/emqx_sm.erl
index 281893fb0..97a1b689c 100644
--- a/src/emqx_sm.erl
+++ b/src/emqx_sm.erl
@@ -49,7 +49,7 @@
 -define(SESSION_ATTRS_TAB, emqx_session_attrs).
 -define(SESSION_STATS_TAB, emqx_session_stats).
 
--define(BATCH_SIZE, 10000).
+-define(BATCH_SIZE, 100000).
 
 -spec(start_link() -> emqx_types:startlink_ret()).
 start_link() ->
@@ -201,7 +201,7 @@ set_session_stats(ClientId, SessPid, Stats) when is_binary(ClientId), is_pid(Ses
 lookup_session_pids(ClientId) ->
     case emqx_sm_registry:is_enabled() of
         true -> emqx_sm_registry:lookup_session(ClientId);
-        false -> ets:lookup(?SESSION_TAB, ClientId, [])
+        false -> emqx_tables:lookup_value(?SESSION_TAB, ClientId, [])
     end.
 
 %% @doc Dispatch a message to the session.