diff --git a/src/background/messages/createListAndAddUsers.ts b/src/background/messages/createListAndAddUsers.ts
deleted file mode 100644
index da1f917..0000000
--- a/src/background/messages/createListAndAddUsers.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { PlasmoMessaging } from "@plasmohq/messaging";
-import { BskyClient } from "~lib/bskyClient";
-import { STORAGE_KEYS } from "~lib/constants";
-
-const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
-  const { name, description, userDids } = req.body;
-
-  const storage = await chrome.storage.local.get(
-    STORAGE_KEYS.BSKY_CLIENT_SESSION,
-  );
-  const session = storage[STORAGE_KEYS.BSKY_CLIENT_SESSION];
-
-  if (!session || !session.did) {
-    res.send({
-      error: {
-        message: "Invalid session data",
-      },
-    });
-    return;
-  }
-
-  try {
-    const client = await BskyClient.createAgentFromSession(session);
-    await client.createListAndAddUsers({ name, description, userDids });
-    res.send({ success: true });
-  } catch (e) {
-    res.send({
-      error: {
-        message: e.message,
-      },
-    });
-  }
-};
-
-export default handler;
diff --git a/src/lib/hooks/useBskyUserManager.ts b/src/lib/hooks/useBskyUserManager.ts
index 237ab4e..eb5b0dd 100644
--- a/src/lib/hooks/useBskyUserManager.ts
+++ b/src/lib/hooks/useBskyUserManager.ts
@@ -131,13 +131,10 @@ export const useBskyUserManager = () => {
 
     if (actionMode === ACTION_MODE.IMPORT_LIST) {
       const userDids = filteredUsers.map((user) => user.did);
-      await chrome.runtime.sendMessage({
-        name: "createListAndAddUsers",
-        body: {
-          name: listName,
-          description: "List imported via Sky Follower Bridge",
-          userDids,
-        },
+      await bskyClient.current.createListAndAddUsers({
+        name: listName,
+        description: "List imported via Sky Follower Bridge",
+        userDids,
       });
       return;
     }