diff --git a/app/api/anthropic/[...path]/route.ts b/app/api/anthropic/[...path]/route.ts
index f50730fa9..495002b8f 100644
--- a/app/api/anthropic/[...path]/route.ts
+++ b/app/api/anthropic/[...path]/route.ts
@@ -4,6 +4,7 @@ import {
   Anthropic,
   ApiPath,
   DEFAULT_MODELS,
+  ServiceProvider,
   ModelProvider,
 } from "@/app/constant";
 import { prettyObject } from "@/app/utils/format";
@@ -143,7 +144,11 @@ async function request(req: NextRequest) {
 
       // not undefined and is false
       if (
-        isModelAvailableInServer(serverConfig.customModels, jsonBody?.model)
+        isModelAvailableInServer(
+          serverConfig.customModels,
+          jsonBody?.model,
+          ServiceProvider.Anthropic,
+        )
       ) {
         return NextResponse.json(
           {
diff --git a/app/api/common.ts b/app/api/common.ts
index 3e0156569..c2dfed4ab 100644
--- a/app/api/common.ts
+++ b/app/api/common.ts
@@ -1,6 +1,11 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getServerSideConfig } from "../config/server";
-import { DEFAULT_MODELS, OPENAI_BASE_URL, GEMINI_BASE_URL } from "../constant";
+import {
+  DEFAULT_MODELS,
+  OPENAI_BASE_URL,
+  GEMINI_BASE_URL,
+  ServiceProvider,
+} from "../constant";
 import { isModelAvailableInServer } from "../utils/model";
 import { makeAzurePath } from "../azure";
 
@@ -90,7 +95,16 @@ export async function requestOpenai(req: NextRequest) {
 
       // not undefined and is false
       if (
-        isModelAvailableInServer(serverConfig.customModels, jsonBody?.model)
+        isModelAvailableInServer(
+          serverConfig.customModels,
+          jsonBody?.model,
+          ServiceProvider.OpenAI,
+        ) ||
+        isModelAvailableInServer(
+          serverConfig.customModels,
+          jsonBody?.model,
+          ServiceProvider.Azure,
+        )
       ) {
         return NextResponse.json(
           {
diff --git a/app/store/config.ts b/app/store/config.ts
index 85929d900..96d6d9125 100644
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -116,12 +116,12 @@ export const useAppConfig = createPersistStore(
 
       for (const model of oldModels) {
         model.available = false;
-        modelMap[`${model.name}@${model.provider.name}`] = model;
+        modelMap[`${model.name}@${model?.provider?.name}`] = model;
       }
 
       for (const model of newModels) {
         model.available = true;
-        modelMap[`${model.name}@${model.provider.name}`] = model;
+        modelMap[`${model.name}@${model?.provider?.name}`] = model;
       }
 
       set(() => ({
diff --git a/app/utils/model.ts b/app/utils/model.ts
index cd3a90611..9bd6ea673 100644
--- a/app/utils/model.ts
+++ b/app/utils/model.ts
@@ -118,7 +118,12 @@ export function collectModelsWithDefaultModel(
   return allModels;
 }
 
-export function isModelAvailableInServer(customModels, modelName) {
+export function isModelAvailableInServer(
+  customModels,
+  modelName,
+  providerName,
+) {
+  const fullName = `${modelName}@${providerName}`;
   const modelTable = collectModelTable(DEFAULT_MODELS, customModels);
-  return modelTable[modelName ?? ""].available === false;
+  return modelTable[fullName]?.available === false;
 }