diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index 37acf84..bd1fe8d 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -133,10 +133,10 @@ export default function App() {
       loadWorkflowIDImpl(latestWfID);
     }
 
-    // if (localStorage.getItem("WORKSPACE_INDEXDB_BACKFILL") === "true") {
-    await backfillIndexdb();
-    localStorage.setItem("WORKSPACE_INDEXDB_BACKFILL", "true");
-    // }
+    if (localStorage.getItem("WORKSPACE_INDEXDB_BACKFILL") !== "true") {
+      await backfillIndexdb();
+      localStorage.setItem("WORKSPACE_INDEXDB_BACKFILL", "true");
+    }
     /**
      * For two-way sync, one-time rewrite all /my_workflows files to the database
      */
diff --git a/ui/src/db-tables/FoldersTable.ts b/ui/src/db-tables/FoldersTable.ts
index 07f18fb..2793a03 100644
--- a/ui/src/db-tables/FoldersTable.ts
+++ b/ui/src/db-tables/FoldersTable.ts
@@ -1,5 +1,5 @@
 import { getDB, saveDB } from "../Api";
-import { listWorkflows, updateFlow } from "./WorkspaceDB";
+import { listWorkflows, loadTable, updateFlow } from "./WorkspaceDB";
 import { Folder } from "../types/dbTypes";
 import { validateOrSaveAllJsonFileMyWorkflows } from "../utils";
 import { getWorkspaceIndexDB, updateWorkspaceIndexDB } from "./IndexDBUtils";
@@ -16,13 +16,7 @@ export class FoldersTable {
 
   static async load(): Promise<FoldersTable> {
     const instance = new FoldersTable();
-    let jsonStr = await getDB(FoldersTable.TABLE_NAME);
-    let json = jsonStr != null ? JSON.parse(jsonStr) : null;
-    if (json == null) {
-      const comfyspace = (await getWorkspaceIndexDB()) ?? "{}";
-      const comfyspaceData = JSON.parse(comfyspace);
-      json = comfyspaceData[FoldersTable.TABLE_NAME];
-    }
+    const json = await loadTable(FoldersTable.TABLE_NAME);
     if (json != null) {
       instance.records = json;
     }
diff --git a/ui/src/db-tables/IndexDBUtils.ts b/ui/src/db-tables/IndexDBUtils.ts
index ee71866..69dbfff 100644
--- a/ui/src/db-tables/IndexDBUtils.ts
+++ b/ui/src/db-tables/IndexDBUtils.ts
@@ -79,7 +79,6 @@ async function readDataFromDatabase(): Promise<string | undefined> {
   }
 }
 
-// Usage example
 export async function getWorkspaceIndexDB() {
   try {
     const comfyspaceData = await readDataFromDatabase();
diff --git a/ui/src/db-tables/WorkspaceDB.ts b/ui/src/db-tables/WorkspaceDB.ts
index 7210553..4dec7a0 100644
--- a/ui/src/db-tables/WorkspaceDB.ts
+++ b/ui/src/db-tables/WorkspaceDB.ts
@@ -62,16 +62,23 @@ export let foldersTable: FoldersTable | null = null;
 export let changelogsTable: ChangelogsTable | null = null;
 export let mediaTable: MediaTable | null = null;
 
+export const loadTable = async (name: Table) => {
+  let jsonStr = await getDB(name);
+  let json: any;
+  try {
+    json = jsonStr != null ? JSON.parse(jsonStr) : null;
+  } catch (e) {}
+  if (json == null) {
+    const comfyspace = (await getWorkspaceIndexDB()) ?? "{}";
+    const comfyspaceData = JSON.parse(comfyspace);
+    json = comfyspaceData[name];
+  }
+  return json ?? {};
+};
+
 export async function loadDBs() {
   const loadWorkflows = async () => {
-    const workflowsStr = await getDB("workflows");
-    if (workflowsStr == null) {
-      const comfyspace = (await getWorkspaceIndexDB()) ?? "{}";
-      const comfyspaceData = JSON.parse(comfyspace);
-      workspace = comfyspaceData["workflows"] || {};
-    } else {
-      workspace = JSON.parse(workflowsStr);
-    }
+    workspace = await loadTable("workflows");
   };
   const loadTags = async () => {
     tagsTable = await loadTagsTable();
@@ -356,7 +363,7 @@ export async function backfillIndexdb() {
   const backfillWorkflows = async () => {
     try {
       const all = listWorkflows();
-      all && (await indexdb.workflows.bulkPut(all));
+      all && (await indexdb.workflows.bulkAdd(all));
     } catch (error) {
       console.error(error);
     }
@@ -364,7 +371,7 @@ export async function backfillIndexdb() {
   const backfillFolders = async () => {
     try {
       const all = foldersTable?.listAll();
-      all && (await indexdb.folders.bulkPut(all));
+      all && (await indexdb.folders.bulkAdd(all));
     } catch (error) {
       console.error(error);
     }
@@ -372,7 +379,7 @@ export async function backfillIndexdb() {
   const backfillMedia = async () => {
     try {
       const all = await mediaTable?.listAll();
-      all && (await indexdb.media.bulkPut(all));
+      all && (await indexdb.media.bulkAdd(all));
     } catch (error) {
       console.error(error);
     }
@@ -380,7 +387,7 @@ export async function backfillIndexdb() {
   const backfillChangelogs = async () => {
     try {
       const all = await changelogsTable?.listAll();
-      all && (await indexdb.changelogs.bulkPut(all));
+      all && (await indexdb.changelogs.bulkAdd(all));
     } catch (error) {
       console.error(error);
     }
@@ -388,7 +395,7 @@ export async function backfillIndexdb() {
   const backfillTags = async () => {
     try {
       const all = await tagsTable?.listAll();
-      all && (await indexdb.tags.bulkPut(all));
+      all && (await indexdb.tags.bulkAdd(all));
     } catch (error) {
       console.error(error);
     }
@@ -396,7 +403,7 @@ export async function backfillIndexdb() {
   const backfillUserSettings = async () => {
     try {
       const all = await userSettingsTable?.listSettings();
-      all && (await indexdb.userSettings.put(all));
+      all && (await indexdb.userSettings.add(all));
     } catch (error) {
       console.error(error);
     }