diff --git a/.env.example b/.env.example
index 83f29aedc..32789eb40 100644
--- a/.env.example
+++ b/.env.example
@@ -32,12 +32,18 @@ OLLAMA_API_BASE_URL=
 # You only need this environment variable set if you want to use OpenAI Like models
 OPENAI_LIKE_API_BASE_URL=
 
+# You only need this environment variable set if you want to use LM Studio models
+LM_STUDIO_API_BASE_URL=
+
 # You only need this environment variable set if you want to use DeepSeek models through their API
 DEEPSEEK_API_KEY=
 
 # Get your OpenAI Like API Key
 OPENAI_LIKE_API_KEY=
 
+# Get your LM Studio API Key
+LM_STUDIO_API_KEY=
+
 # Get your Mistral API Key by following these instructions -
 # https://console.mistral.ai/api-keys/
 # You only need this environment variable set if you want to use Mistral models
diff --git a/Dockerfile b/Dockerfile
index 3b5a74cde..d88da0152 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,8 @@ ARG ANTHROPIC_API_KEY
 ARG OPEN_ROUTER_API_KEY
 ARG GOOGLE_GENERATIVE_AI_API_KEY
 ARG OLLAMA_API_BASE_URL
+ARG LM_STUDIO_API_BASE_URL
+ARG LM_STUDIO_API_KEY
 ARG VITE_LOG_LEVEL=debug
 
 ENV WRANGLER_SEND_METRICS=false \
@@ -33,6 +35,8 @@ ENV WRANGLER_SEND_METRICS=false \
     OPEN_ROUTER_API_KEY=${OPEN_ROUTER_API_KEY} \
     GOOGLE_GENERATIVE_AI_API_KEY=${GOOGLE_GENERATIVE_AI_API_KEY} \
     OLLAMA_API_BASE_URL=${OLLAMA_API_BASE_URL} \
+    LM_STUDIO_API_BASE_URL=${LM_STUDIO_API_BASE_URL} \
+    LM_STUDIO_API_KEY=${LM_STUDIO_API_KEY} \
     VITE_LOG_LEVEL=${VITE_LOG_LEVEL}
 
 # Pre-configure wrangler to disable metrics
@@ -53,6 +57,8 @@ ARG ANTHROPIC_API_KEY
 ARG OPEN_ROUTER_API_KEY
 ARG GOOGLE_GENERATIVE_AI_API_KEY
 ARG OLLAMA_API_BASE_URL
+ARG LM_STUDIO_API_BASE_URL
+ARG LM_STUDIO_API_KEY
 ARG VITE_LOG_LEVEL=debug
 
 ENV GROQ_API_KEY=${GROQ_API_KEY} \
@@ -61,6 +67,8 @@ ENV GROQ_API_KEY=${GROQ_API_KEY} \
     OPEN_ROUTER_API_KEY=${OPEN_ROUTER_API_KEY} \
     GOOGLE_GENERATIVE_AI_API_KEY=${GOOGLE_GENERATIVE_AI_API_KEY} \
     OLLAMA_API_BASE_URL=${OLLAMA_API_BASE_URL} \
+    LM_STUDIO_API_BASE_URL=${LM_STUDIO_API_BASE_URL} \
+    LM_STUDIO_API_KEY=${LM_STUDIO_API_KEY} \
     VITE_LOG_LEVEL=${VITE_LOG_LEVEL}
 
 RUN mkdir -p ${WORKDIR}/run
diff --git a/README.md b/README.md
index 54ae824ed..a866bd2be 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ This fork of Bolt.new allows you to choose the LLM that you use for each prompt!
 - ⬜ **HIGH PRIORITY** Load local projects into the app
 - ⬜ **HIGH PRIORITY** - Attach images to prompts
 - ⬜ **HIGH PRIORITY** - Run agents in the backend as opposed to a single model call
-- ⬜ LM Studio Integration
+- ✅ LM Studio Integration
 - ⬜ Together Integration
 - ⬜ Azure Open AI API Integration
 - ⬜ HuggingFace Integration
@@ -68,9 +68,9 @@ Many of you are new users to installing software from Github. If you have any in
 
 1. Install Git from https://git-scm.com/downloads
 
-2. Install Node.js from https://nodejs.org/en/download/ 
+2. Install Node.js from https://nodejs.org/en/download/
 
-Pay attention to the installer notes after completion. 
+Pay attention to the installer notes after completion.
 
 On all operating systems, the path to Node.js should automatically be added to your system path. But you can check your path if you want to be sure. On Windows, you can search for "edit the system environment variables" in your system, select "Environment Variables..." once you are in the system properties, and then check for a path to Node in your "Path" system variable. On a Mac or Linux machine, it will tell you to check if /usr/local/bin is in your $PATH. To determine if usr/local/bin is included in $PATH open your Terminal and run:
 
@@ -200,7 +200,7 @@ FROM [Ollama model ID such as qwen2.5-coder:7b]
 PARAMETER num_ctx 32768
 ```
 
-- Run the command: 
+- Run the command:
 
 ```
 ollama create -f Modelfile [your new model ID, can be whatever you want (example: qwen2.5-coder-extra-ctx:7b)]
@@ -211,7 +211,7 @@ You'll see this new model in the list of Ollama models along with all the others
 
 ## Adding New LLMs:
 
-To make new LLMs available to use in this version of Bolt.new, head on over to `app/utils/constants.ts` and find the constant MODEL_LIST. Each element in this array is an object that has the model ID for the name (get this from the provider's API documentation), a label for the frontend model dropdown, and the provider. 
+To make new LLMs available to use in this version of Bolt.new, head on over to `app/utils/constants.ts` and find the constant MODEL_LIST. Each element in this array is an object that has the model ID for the name (get this from the provider's API documentation), a label for the frontend model dropdown, and the provider.
 
 By default, Anthropic, OpenAI, Groq, and Ollama are implemented as providers, but the YouTube video for this repo covers how to extend this to work with more providers if you wish!
 
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..0da1c8013 100644
--- a/app/lib/.server/llm/api-key.ts
+++ b/app/lib/.server/llm/api-key.ts
@@ -26,15 +26,17 @@ export function getAPIKey(cloudflareEnv: Env, provider: string, userApiKeys?: Re
     case 'OpenRouter':
       return env.OPEN_ROUTER_API_KEY || cloudflareEnv.OPEN_ROUTER_API_KEY;
     case 'Deepseek':
-      return env.DEEPSEEK_API_KEY || cloudflareEnv.DEEPSEEK_API_KEY
+      return env.DEEPSEEK_API_KEY || cloudflareEnv.DEEPSEEK_API_KEY;
     case 'Mistral':
-      return env.MISTRAL_API_KEY || cloudflareEnv.MISTRAL_API_KEY;        
-    case "OpenAILike":
+      return env.MISTRAL_API_KEY || cloudflareEnv.MISTRAL_API_KEY;
+    case 'OpenAILike':
       return env.OPENAI_LIKE_API_KEY || cloudflareEnv.OPENAI_LIKE_API_KEY;
+    case 'LMStudio':
+      return env.LM_STUDIO_API_KEY || cloudflareEnv.LM_STUDIO_API_KEY;
     case "xAI":
       return env.XAI_API_KEY || cloudflareEnv.XAI_API_KEY;
     default:
-      return "";
+      return '';
   }
 }
 
@@ -42,13 +44,15 @@ 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.LM_STUDIO_API_BASE_URL || cloudflareEnv.LM_STUDIO_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') {
-          baseUrl = baseUrl.replace("localhost", "host.docker.internal");
-        }
-        return baseUrl;
+      let baseUrl = env.OLLAMA_API_BASE_URL || cloudflareEnv.OLLAMA_API_BASE_URL || 'http://localhost:11434';
+      if (env.RUNNING_IN_DOCKER === 'true') {
+        baseUrl = baseUrl.replace('localhost', 'host.docker.internal');
+      }
+      return baseUrl;
     default:
-      return "";
+      return '';
   }
 }
diff --git a/app/lib/.server/llm/model.ts b/app/lib/.server/llm/model.ts
index 26c4aa782..1817b2f87 100644
--- a/app/lib/.server/llm/model.ts
+++ b/app/lib/.server/llm/model.ts
@@ -5,7 +5,7 @@ import { createAnthropic } from '@ai-sdk/anthropic';
 import { createOpenAI } from '@ai-sdk/openai';
 import { createGoogleGenerativeAI } from '@ai-sdk/google';
 import { ollama } from 'ollama-ai-provider';
-import { createOpenRouter } from "@openrouter/ai-sdk-provider";
+import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { mistral } from '@ai-sdk/mistral';
 import { createMistral } from '@ai-sdk/mistral';
 
@@ -16,7 +16,7 @@ export function getAnthropicModel(apiKey: string, model: string) {
 
   return anthropic(model);
 }
-export function getOpenAILikeModel(baseURL:string,apiKey: string, model: string) {
+export function getOpenAILikeModel(baseURL: string, apiKey: string, model: string) {
   const openai = createOpenAI({
     baseURL,
     apiKey,
@@ -34,16 +34,14 @@ export function getOpenAIModel(apiKey: string, model: string) {
 
 export function getMistralModel(apiKey: string, model: string) {
   const mistral = createMistral({
-    apiKey
+    apiKey,
   });
 
   return mistral(model);
 }
 
 export function getGoogleModel(apiKey: string, model: string) {
-  const google = createGoogleGenerativeAI(
-    apiKey,
-  );
+  const google = createGoogleGenerativeAI(apiKey);
 
   return google(model);
 }
@@ -66,7 +64,7 @@ export function getOllamaModel(baseURL: string, model: string) {
   return Ollama;
 }
 
-export function getDeepseekModel(apiKey: string, model: string){
+export function getDeepseekModel(apiKey: string, model: string) {
   const openai = createOpenAI({
     baseURL: 'https://api.deepseek.com/beta',
     apiKey,
@@ -77,7 +75,7 @@ export function getDeepseekModel(apiKey: string, model: string){
 
 export function getOpenRouterModel(apiKey: string, model: string) {
   const openRouter = createOpenRouter({
-    apiKey
+    apiKey,
   });
 
   return openRouter.chat(model);
@@ -105,13 +103,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);
+      return getOpenAILikeModel(baseURL, apiKey, model);
+    case 'LMStudio':
+      return getOpenAILikeModel(`${baseURL}/v1`, apiKey, model);
     case 'Deepseek':
-      return getDeepseekModel(apiKey, model)
+      return getDeepseekModel(apiKey, model);
     case 'Mistral':
-      return  getMistralModel(apiKey, model);
+      return getMistralModel(apiKey, model);
     case 'xAI':
       return getXAIModel(apiKey, model);
     default:
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index 41b7f5772..7faa3436e 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -37,8 +37,8 @@ const staticModels: ModelInfo[] = [
   { name: 'gpt-4', label: 'GPT-4', provider: 'OpenAI' },
   { name: 'gpt-3.5-turbo', label: 'GPT-3.5 Turbo', provider: 'OpenAI' },
   { name: 'grok-beta', label: "xAI Grok Beta", provider: 'xAI' },
-  { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek'},
-  { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek'},
+  { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek' },
+  { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek' },
   { name: 'open-mistral-7b', label: 'Mistral 7B', provider: 'Mistral' },
   { name: 'open-mixtral-8x7b', label: 'Mistral 8x7B', provider: 'Mistral' },
   { name: 'open-mixtral-8x22b', label: 'Mistral 8x22B', provider: 'Mistral' },
@@ -72,7 +72,7 @@ async function getOllamaModels(): Promise<ModelInfo[]> {
   try {
     const base_url = getOllamaBaseUrl();
     const response = await fetch(`${base_url}/api/tags`);
-    const data = await response.json() as OllamaApiResponse;
+    const data = (await response.json()) as OllamaApiResponse;
 
     return data.models.map((model: OllamaModel) => ({
       name: model.name,
@@ -100,17 +100,35 @@ async function getOpenAILikeModels(): Promise<ModelInfo[]> {
     return res.data.map((model: any) => ({
       name: model.id,
       label: model.id,
-      provider: 'OpenAILike',
+      provider,
     }));
   } catch (e) {
-    return []
+    return [];
   }
+}
 
+async function getOpenAILikeModels(): Promise<ModelInfo[]> {
+  const baseURL = import.meta.env.OPENAI_LIKE_API_BASE_URL || '';
+  const apiKey = import.meta.env.OPENAI_LIKE_API_KEY ?? '';
+  const provider = 'OpenAILike';
+
+  return getOAILikeModels(baseURL, apiKey, provider);
 }
+
+async function getLMStudioModels(): Promise<ModelInfo[]> {
+  const baseURL = import.meta.env.LM_STUDIO_API_BASE_URL || 'http://localhost:1234';
+  const apiKey = import.meta.env.LM_STUDIO_API_KEY ?? 'lm-studio';
+  const provider = 'LMStudio';
+
+  return getOAILikeModels(`${baseURL}/v1`, apiKey, provider);
+}
+
 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, ...lmStudioModels, ...staticModels];
 }
+
 initializeModelList().then();
 export { getOllamaModels, getOpenAILikeModels, initializeModelList };
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c391dd732..67c1c2230 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,10 +19,12 @@ services:
       - OPEN_ROUTER_API_KEY=${OPEN_ROUTER_API_KEY}
       - GOOGLE_GENERATIVE_AI_API_KEY=${GOOGLE_GENERATIVE_AI_API_KEY}
       - OLLAMA_API_BASE_URL=${OLLAMA_API_BASE_URL}
+      - LM_STUDIO_API_BASE_URL=${LM_STUDIO_API_BASE_URL}
+      - LM_STUDIO_API_KEY= ${LM_STUDIO_API_KEY}
       - VITE_LOG_LEVEL=${VITE_LOG_LEVEL:-debug}
       - RUNNING_IN_DOCKER=true
     extra_hosts:
-      - "host.docker.internal:host-gateway"      
+      - "host.docker.internal:host-gateway"
     command: pnpm run dockerstart
     profiles:
       - production  # This service only runs in the production profile
@@ -37,7 +39,7 @@ services:
       - VITE_HMR_HOST=localhost
       - VITE_HMR_PORT=5173
       - CHOKIDAR_USEPOLLING=true
-      - WATCHPACK_POLLING=true  
+      - WATCHPACK_POLLING=true
       - PORT=5173
       - GROQ_API_KEY=${GROQ_API_KEY}
       - OPENAI_API_KEY=${OPENAI_API_KEY}
@@ -45,10 +47,12 @@ services:
       - OPEN_ROUTER_API_KEY=${OPEN_ROUTER_API_KEY}
       - GOOGLE_GENERATIVE_AI_API_KEY=${GOOGLE_GENERATIVE_AI_API_KEY}
       - OLLAMA_API_BASE_URL=${OLLAMA_API_BASE_URL}
+      - LM_STUDIO_API_BASE_URL=${LM_STUDIO_API_BASE_URL}
+      - LM_STUDIO_API_KEY= ${LM_STUDIO_API_KEY}
       - VITE_LOG_LEVEL=${VITE_LOG_LEVEL:-debug}
       - RUNNING_IN_DOCKER=true
     extra_hosts:
-      - "host.docker.internal:host-gateway"      
+      - "host.docker.internal:host-gateway"
     volumes:
       - type: bind
         source: .
diff --git a/vite.config.ts b/vite.config.ts
index 625390702..d8e44b0d4 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_","LM_STUDIO_API_","OLLAMA_API_BASE_URL"],
     css: {
       preprocessorOptions: {
         scss: {
diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts
index 82961ecd6..21f3c0868 100644
--- a/worker-configuration.d.ts
+++ b/worker-configuration.d.ts
@@ -6,5 +6,7 @@ interface Env {
   OLLAMA_API_BASE_URL: string;
   OPENAI_LIKE_API_KEY: string;
   OPENAI_LIKE_API_BASE_URL: string;
+  LM_STUDIO_API_KEY: string;
+  LM_STUDIO_API_BASE_URL: string;
   DEEPSEEK_API_KEY: string;
 }