diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts
index 7e44909e4..dfe413002 100644
--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@@ -257,12 +257,14 @@ export class ChatGPTApi implements LLMApi {
     const chatModels = resJson.data?.filter((m) => m.id.startsWith("gpt-"));
     console.log("[Models]", chatModels);
 
-    return (
-      chatModels?.map((m) => ({
-        name: m.id,
-        available: true,
-      })) || []
-    );
+    if (!chatModels) {
+      return [];
+    }
+
+    return chatModels.map((m) => ({
+      name: m.id,
+      available: true,
+    }));
   }
 }
 export { OpenaiPath };
diff --git a/app/store/config.ts b/app/store/config.ts
index cf390c74d..075c2acff 100644
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -117,6 +117,10 @@ export const useAppConfig = create<ChatConfigStore>()(
       },
 
       mergeModels(newModels) {
+        if (!newModels || newModels.length === 0) {
+          return;
+        }
+
         const oldModels = get().models;
         const modelMap: Record<string, LLMModel> = {};