diff --git a/.env.example b/.env.example
index 83f29aedc..46a21e892 100644
--- a/.env.example
+++ b/.env.example
@@ -43,6 +43,12 @@ OPENAI_LIKE_API_KEY=
 # You only need this environment variable set if you want to use Mistral models
 MISTRAL_API_KEY=
 
+
+# Get LMStudio Base URL from LM Studio Developer Console
+# Make sure to enable CORS
+# Example: http://localhost:1234
+LMSTUDIO_API_BASE_URL=
+
 # Get your xAI API key
 # https://x.ai/api
 # You only need this environment variable set if you want to use xAI models
diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index e91254a17..f33114739 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -49,6 +49,9 @@ const ModelSelector = ({ model, setModel, provider, setProvider, modelList, prov
         <option key="OpenAILike" value="OpenAILike">
           OpenAILike
         </option>
+        <option key="LMStudio" value="LMStudio">
+          LMStudio
+        </option>
       </select>
       <select
         value={model}
diff --git a/app/lib/.server/llm/api-key.ts b/app/lib/.server/llm/api-key.ts
index f9c027b70..464e334dd 100644
--- a/app/lib/.server/llm/api-key.ts
+++ b/app/lib/.server/llm/api-key.ts
@@ -42,6 +42,8 @@ export function getBaseURL(cloudflareEnv: Env, provider: string) {
   switch (provider) {
     case 'OpenAILike':
       return env.OPENAI_LIKE_API_BASE_URL || cloudflareEnv.OPENAI_LIKE_API_BASE_URL;
+    case 'LMStudio':
+      return env.LMSTUDIO_API_BASE_URL || cloudflareEnv.LMSTUDIO_API_BASE_URL || "http://localhost:1234";
     case 'Ollama':
         let baseUrl = env.OLLAMA_API_BASE_URL || cloudflareEnv.OLLAMA_API_BASE_URL || "http://localhost:11434";
         if (env.RUNNING_IN_DOCKER === 'true') {
diff --git a/app/lib/.server/llm/model.ts b/app/lib/.server/llm/model.ts
index 26c4aa782..1babe7a2c 100644
--- a/app/lib/.server/llm/model.ts
+++ b/app/lib/.server/llm/model.ts
@@ -83,6 +83,15 @@ export function getOpenRouterModel(apiKey: string, model: string) {
   return openRouter.chat(model);
 }
 
+export function getLMStudioModel(baseURL: string, model: string) {
+  const lmstudio = createOpenAI({
+    baseUrl: `${baseURL}/v1`,
+    apiKey: "",
+  });
+
+  return lmstudio(model);
+}
+
 export function getXAIModel(apiKey: string, model: string) {
   const openai = createOpenAI({
     baseURL: 'https://api.x.ai/v1',
@@ -105,13 +114,15 @@ export function getModel(provider: string, model: string, env: Env, apiKeys?: Re
     case 'OpenRouter':
       return getOpenRouterModel(apiKey, model);
     case 'Google':
-      return getGoogleModel(apiKey, model)
+      return getGoogleModel(apiKey, model);
     case 'OpenAILike':
       return getOpenAILikeModel(baseURL,apiKey, model);
     case 'Deepseek':
-      return getDeepseekModel(apiKey, model)
+      return getDeepseekModel(apiKey, model);
     case 'Mistral':
       return  getMistralModel(apiKey, model);
+    case 'LMStudio':
+      return getLMStudioModel(baseURL, model);
     case 'xAI':
       return getXAIModel(apiKey, model);
     default:
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index 41b7f5772..8ac4151d5 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -107,10 +107,28 @@ async function getOpenAILikeModels(): Promise<ModelInfo[]> {
   }
 
 }
+
+async function getLMStudioModels(): Promise<ModelInfo[]> {
+  try {
+    const base_url = import.meta.env.LMSTUDIO_API_BASE_URL || "http://localhost:1234";
+    const response = await fetch(`${base_url}/v1/models`);
+    const data = await response.json() as any;
+    return data.data.map((model: any) => ({
+      name: model.id,
+      label: model.id,
+      provider: 'LMStudio',
+    }));
+  } catch (e) {
+    return [];
+  }
+}
+
+
 async function initializeModelList(): Promise<void> {
   const ollamaModels = await getOllamaModels();
   const openAiLikeModels = await getOpenAILikeModels();
-  MODEL_LIST = [...ollamaModels, ...openAiLikeModels, ...staticModels];
+  const lmstudioModels = await getLMStudioModels();
+  MODEL_LIST = [...ollamaModels,...openAiLikeModels, ...staticModels,...lmstudioModels,];
 }
 initializeModelList().then();
-export { getOllamaModels, getOpenAILikeModels, initializeModelList };
\ No newline at end of file
+export { getOllamaModels,getOpenAILikeModels,getLMStudioModels,initializeModelList };
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index 625390702..9c94ceae3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -27,7 +27,7 @@ export default defineConfig((config) => {
       chrome129IssuePlugin(),
       config.mode === 'production' && optimizeCssModules({ apply: 'build' }),
     ],
-    envPrefix:["VITE_","OPENAI_LIKE_API_","OLLAMA_API_BASE_URL"],
+    envPrefix:["VITE_","OPENAI_LIKE_API_","OLLAMA_API_BASE_URL","LMSTUDIO_API_BASE_URL"],
     css: {
       preprocessorOptions: {
         scss: {
diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts
index 82961ecd6..6db1aa60e 100644
--- a/worker-configuration.d.ts
+++ b/worker-configuration.d.ts
@@ -7,4 +7,5 @@ interface Env {
   OPENAI_LIKE_API_KEY: string;
   OPENAI_LIKE_API_BASE_URL: string;
   DEEPSEEK_API_KEY: string;
+  LMSTUDIO_API_BASE_URL: string;
 }