diff --git a/public/scripts/util/AccountStorage.js b/public/scripts/util/AccountStorage.js
index 01d07c0aa..08e7e404a 100644
--- a/public/scripts/util/AccountStorage.js
+++ b/public/scripts/util/AccountStorage.js
@@ -49,11 +49,13 @@ class AccountStorage {
     #ready = false;
 
     #migrateLocalStorage() {
+        const localStorageKeys = [];
         for (let i = 0; i < globalThis.localStorage.length; i++) {
-            const key = globalThis.localStorage.key(i);
-            const value = globalThis.localStorage.getItem(key);
-
+            localStorageKeys.push(globalThis.localStorage.key(i));
+        }
+        for (const key of localStorageKeys) {
             if (MIGRATABLE_KEYS.some(k => k.test(key))) {
+                const value = globalThis.localStorage.getItem(key);
                 this.#state[key] = value;
                 globalThis.localStorage.removeItem(key);
             }