diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go
index 8a9da0577..92a6c4b8f 100644
--- a/internal/push/push_rpc_server.go
+++ b/internal/push/push_rpc_server.go
@@ -51,8 +51,8 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 		client,
 		offlinePusher,
 		database,
-		rpccache.NewGroupLocalCache(rpcclient.NewGroupRpcClient(client), rdb),
-		rpccache.NewConversationLocalCache(rpcclient.NewConversationRpcClient(client), rdb),
+		rpccache.NewGroupLocalCache(groupRpcClient, rdb),
+		rpccache.NewConversationLocalCache(conversationRpcClient, rdb),
 		&conversationRpcClient,
 		&groupRpcClient,
 		&msgRpcClient,