diff --git a/src/contexts/MapDataContext.js b/src/contexts/MapDataContext.js
index 6dde09a..aafa393 100644
--- a/src/contexts/MapDataContext.js
+++ b/src/contexts/MapDataContext.js
@@ -57,7 +57,7 @@ export function MapDataProvider({ children }) {
     async function loadMaps() {
       let storedMaps = [];
       // Use a cursor instead of toArray to prevent IPC max size error
-      database.table("maps").each((map) => storedMaps.push(map));
+      await database.table("maps").each((map) => storedMaps.push(map));
       const sortedMaps = storedMaps.sort((a, b) => b.created - a.created);
       const defaultMapsWithIds = await getDefaultMaps();
       const allMaps = [...sortedMaps, ...defaultMapsWithIds];
diff --git a/src/contexts/TokenDataContext.js b/src/contexts/TokenDataContext.js
index 753a3aa..632878b 100644
--- a/src/contexts/TokenDataContext.js
+++ b/src/contexts/TokenDataContext.js
@@ -32,7 +32,7 @@ export function TokenDataProvider({ children }) {
     async function loadTokens() {
       let storedTokens = [];
       // Use a cursor instead of toArray to prevent IPC max size error
-      database.table("tokens").each((token) => storedTokens.push(token));
+      await database.table("tokens").each((token) => storedTokens.push(token));
       const sortedTokens = storedTokens.sort((a, b) => b.created - a.created);
       const defaultTokensWithIds = getDefaultTokes();
       const allTokens = [...sortedTokens, ...defaultTokensWithIds];