diff --git a/src/lib/models/providers/index.ts b/src/lib/models/providers/index.ts
index ef52f4b..cabfaa9 100644
--- a/src/lib/models/providers/index.ts
+++ b/src/lib/models/providers/index.ts
@@ -7,6 +7,7 @@ import TransformersProvider from './transformers';
 import GroqProvider from './groq';
 import LemonadeProvider from './lemonade';
 import AnthropicProvider from './anthropic';
+import LMStudioProvider from './lmstudio';
 
 export const providers: Record<string, ProviderConstructor<any>> = {
   openai: OpenAIProvider,
@@ -16,6 +17,7 @@ export const providers: Record<string, ProviderConstructor<any>> = {
   groq: GroqProvider,
   lemonade: LemonadeProvider,
   anthropic: AnthropicProvider,
+  lmstudio: LMStudioProvider,
 };
 
 export const getModelProvidersUIConfigSection =
diff --git a/src/lib/models/providers/lmstudio/index.ts b/src/lib/models/providers/lmstudio/index.ts
new file mode 100644
index 0000000..4dcefdd
--- /dev/null
+++ b/src/lib/models/providers/lmstudio/index.ts
@@ -0,0 +1,143 @@
+import { UIConfigField } from '@/lib/config/types';
+import { getConfiguredModelProviderById } from '@/lib/config/serverRegistry';
+import BaseModelProvider from '../../base/provider';
+import { Model, ModelList, ProviderMetadata } from '../../types';
+import LMStudioLLM from './lmstudioLLM';
+import BaseLLM from '../../base/llm';
+import BaseEmbedding from '../../base/embedding';
+import LMStudioEmbedding from './lmstudioEmbedding';
+
+interface LMStudioConfig {
+  baseURL: string;
+}
+
+const providerConfigFields: UIConfigField[] = [
+  {
+    type: 'string',
+    name: 'Base URL',
+    key: 'baseURL',
+    description: 'The base URL for LM Studio server',
+    required: true,
+    placeholder: 'http://localhost:1234',
+    env: 'LM_STUDIO_BASE_URL',
+    scope: 'server',
+  },
+];
+
+class LMStudioProvider extends BaseModelProvider<LMStudioConfig> {
+  constructor(id: string, name: string, config: LMStudioConfig) {
+    super(id, name, config);
+  }
+
+  private normalizeBaseURL(url: string): string {
+    const trimmed = url.trim().replace(/\/+$/, '');
+    return trimmed.endsWith('/v1') ? trimmed : `${trimmed}/v1`;
+  }
+
+  async getDefaultModels(): Promise<ModelList> {
+    try {
+      const baseURL = this.normalizeBaseURL(this.config.baseURL);
+
+      const res = await fetch(`${baseURL}/models`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+
+      const data = await res.json();
+
+      const models: Model[] = data.data.map((m: any) => {
+        return {
+          name: m.id,
+          key: m.id,
+        };
+      });
+
+      return {
+        embedding: models,
+        chat: models,
+      };
+    } catch (err) {
+      if (err instanceof TypeError) {
+        throw new Error(
+          'Error connecting to LM Studio. Please ensure the base URL is correct and the LM Studio server is running.',
+        );
+      }
+
+      throw err;
+    }
+  }
+
+  async getModelList(): Promise<ModelList> {
+    const defaultModels = await this.getDefaultModels();
+    const configProvider = getConfiguredModelProviderById(this.id)!;
+
+    return {
+      embedding: [
+        ...defaultModels.embedding,
+        ...configProvider.embeddingModels,
+      ],
+      chat: [...defaultModels.chat, ...configProvider.chatModels],
+    };
+  }
+
+  async loadChatModel(key: string): Promise<BaseLLM<any>> {
+    const modelList = await this.getModelList();
+
+    const exists = modelList.chat.find((m) => m.key === key);
+
+    if (!exists) {
+      throw new Error(
+        'Error Loading LM Studio Chat Model. Invalid Model Selected',
+      );
+    }
+
+    return new LMStudioLLM({
+      apiKey: 'lm-studio',
+      model: key,
+      baseURL: this.normalizeBaseURL(this.config.baseURL),
+    });
+  }
+
+  async loadEmbeddingModel(key: string): Promise<BaseEmbedding<any>> {
+    const modelList = await this.getModelList();
+    const exists = modelList.embedding.find((m) => m.key === key);
+
+    if (!exists) {
+      throw new Error(
+        'Error Loading LM Studio Embedding Model. Invalid Model Selected.',
+      );
+    }
+
+    return new LMStudioEmbedding({
+      apiKey: 'lm-studio',
+      model: key,
+      baseURL: this.normalizeBaseURL(this.config.baseURL),
+    });
+  }
+
+  static parseAndValidate(raw: any): LMStudioConfig {
+    if (!raw || typeof raw !== 'object')
+      throw new Error('Invalid config provided. Expected object');
+    if (!raw.baseURL)
+      throw new Error('Invalid config provided. Base URL must be provided');
+
+    return {
+      baseURL: String(raw.baseURL),
+    };
+  }
+
+  static getProviderConfigFields(): UIConfigField[] {
+    return providerConfigFields;
+  }
+
+  static getProviderMetadata(): ProviderMetadata {
+    return {
+      key: 'lmstudio',
+      name: 'LM Studio',
+    };
+  }
+}
+
+export default LMStudioProvider;
diff --git a/src/lib/models/providers/lmstudio/lmstudioEmbedding.ts b/src/lib/models/providers/lmstudio/lmstudioEmbedding.ts
new file mode 100644
index 0000000..a9037d2
--- /dev/null
+++ b/src/lib/models/providers/lmstudio/lmstudioEmbedding.ts
@@ -0,0 +1,5 @@
+import OpenAIEmbedding from '../openai/openaiEmbedding';
+
+class LMStudioEmbedding extends OpenAIEmbedding {}
+
+export default LMStudioEmbedding;
diff --git a/src/lib/models/providers/lmstudio/lmstudioLLM.ts b/src/lib/models/providers/lmstudio/lmstudioLLM.ts
new file mode 100644
index 0000000..4e98dc8
--- /dev/null
+++ b/src/lib/models/providers/lmstudio/lmstudioLLM.ts
@@ -0,0 +1,5 @@
+import OpenAILLM from '../openai/openaiLLM';
+
+class LMStudioLLM extends OpenAILLM {}
+
+export default LMStudioLLM;