diff --git a/extension/src/service-worker/router/popup-only.ts b/extension/src/service-worker/router/popup-only.ts
index b7ca4a4..83a027d 100644
--- a/extension/src/service-worker/router/popup-only.ts
+++ b/extension/src/service-worker/router/popup-only.ts
@@ -483,10 +483,11 @@ export async function handle(
           repoPath: msg.newRemote.repoPath,
           apiToken: msg.newRemote.apiToken,
         };
-        await chrome.storage.local.set({ vaultConfig: cfg });
+        const storageUpdate: Record<string, unknown> = { vaultConfig: cfg };
         if (out.reference_jpg) {
-          await chrome.storage.local.set({ imageBase64: out.reference_jpg });
+          storageUpdate.imageBase64 = out.reference_jpg;
         }
+        await chrome.storage.local.set(storageUpdate);
 
         // Make sure the SW's gitHost cache picks up the new config.
         state.gitHost = newHost;