diff --git a/app/api/common.ts b/app/api/common.ts
index 30d5e0daf..6d6a7d1fb 100644
--- a/app/api/common.ts
+++ b/app/api/common.ts
@@ -35,12 +35,12 @@ export async function requestOpenai(req: NextRequest) {
   const fetchOptions: RequestInit = {
     headers: {
       "Content-Type": "application/json",
+      "Cache-Control": "no-store",
       Authorization: authValue,
       ...(process.env.OPENAI_ORG_ID && {
         "OpenAI-Organization": process.env.OPENAI_ORG_ID,
       }),
     },
-    cache: "no-store",
     method: req.method,
     body: req.body,
     // @ts-ignore
diff --git a/app/store/mask.ts b/app/store/mask.ts
index 105ca3469..02132b77d 100644
--- a/app/store/mask.ts
+++ b/app/store/mask.ts
@@ -109,7 +109,7 @@ export const useMaskStore = create<MaskStore>()(
     }),
     {
       name: StoreKey.Mask,
-      version: 3,
+      version: 3.1,
 
       migrate(state, version) {
         const newState = JSON.parse(JSON.stringify(state)) as MaskState;
@@ -119,6 +119,14 @@ export const useMaskStore = create<MaskStore>()(
           Object.values(newState.masks).forEach((m) => (m.id = nanoid()));
         }
 
+        if (version < 3.1) {
+          const updatedMasks: Record<string, Mask> = {};
+          Object.values(newState.masks).forEach((m) => {
+            updatedMasks[m.id] = m;
+          });
+          newState.masks = updatedMasks;
+        }
+
         return newState as any;
       },
     },