diff --git a/package.json b/package.json
index 9f61e9b..e63fca6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sky-follower-bridge",
   "displayName": "Sky Follower Bridge",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Instantly find and follow the same users from your Twitter follows on Bluesky.",
   "author": "kawamataryou",
   "scripts": {
diff --git a/src/popup.tsx b/src/popup.tsx
index 0240303..41f7efb 100644
--- a/src/popup.tsx
+++ b/src/popup.tsx
@@ -105,7 +105,7 @@ function IndexPopup() {
       )
       .run();
 
-    chrome.storage.local.set({
+    await chrome.storage.local.set({
       [STORAGE_KEYS.BSKY_MESSAGE_NAME]: messageName,
     });
 
@@ -124,12 +124,6 @@ function IndexPopup() {
           ...(authFactorToken && { authFactorToken: authFactorToken }),
         },
       });
-      chrome.storage.local.set({
-        [STORAGE_KEYS.BSKY_CLIENT_SESSION]: session,
-      });
-      await sendToContentScript({
-        name: messageName,
-      });
       if (error) {
         if (error.message.includes(AUTH_FACTOR_TOKEN_REQUIRED_ERROR_MESSAGE)) {
           setIsShowAuthFactorTokenInput(true);
@@ -138,6 +132,12 @@ function IndexPopup() {
           setErrorMessage(error.message);
         }
       } else {
+        await chrome.storage.local.set({
+          [STORAGE_KEYS.BSKY_CLIENT_SESSION]: session,
+        });
+        await sendToContentScript({
+          name: messageName,
+        });
         saveShowAuthFactorTokenInputToStorage(false);
         window.close();
       }