diff --git a/config.json b/config.json
index 4979c7f..fe02ea1 100644
--- a/config.json
+++ b/config.json
@@ -22,7 +22,10 @@
     "name": "@aibrow/extension"
   },
 
-  "defaultAiModel": "smollm2-1-7b-instruct-q4-k-m",
+  "defaultModels": {
+    "text": "smollm2-1-7b-instruct-q4-k-m",
+    "embedding": "nomic-embed-text-v1-5-q8-0"
+  },
   "modelMinMachineScore": 0,
   "permissionRequiredForDefaultModel": false,
   "permissionAlwaysAllowedOrigins": ["https://aibrow.ai"],
diff --git a/src/extension/background/APIHandler/AICoreModelHandler.ts b/src/extension/background/APIHandler/AICoreModelHandler.ts
index 840f404..501ad7c 100644
--- a/src/extension/background/APIHandler/AICoreModelHandler.ts
+++ b/src/extension/background/APIHandler/AICoreModelHandler.ts
@@ -16,7 +16,7 @@ import {
 import APIHelper from './APIHelper'
 import AILlmSession from '../AI/AILlmSession'
 import { nanoid } from 'nanoid'
-import { AICapabilityPromptType } from '#Shared/API/AI'
+import { AICapabilityPromptType, AIModelType } from '#Shared/API/AI'
 import { kModelPromptAborted } from '#Shared/Errors'
 
 class AICoreModelHandler {
@@ -46,7 +46,7 @@ class AICoreModelHandler {
   /* **************************************************************************/
 
   #handleGetCapabilities = async (channel: IPCInflightChannel) => {
-    return APIHelper.handleGetStandardCapabilitiesData(channel, AICapabilityPromptType.CoreModel)
+    return APIHelper.handleGetStandardCapabilitiesData(channel, AIModelType.Text, AICapabilityPromptType.CoreModel)
   }
 
   /* **************************************************************************/
@@ -54,7 +54,7 @@ class AICoreModelHandler {
   /* **************************************************************************/
 
   #handleCreate = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardCreatePreflight(channel, AICapabilityPromptType.CoreModel, async (
+    return await APIHelper.handleStandardCreatePreflight(channel, AIModelType.Text, AICapabilityPromptType.CoreModel, async (
       manifest,
       payload,
       props
@@ -75,7 +75,7 @@ class AICoreModelHandler {
   /* **************************************************************************/
 
   #handlePrompt = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
@@ -102,7 +102,7 @@ class AICoreModelHandler {
   /* **************************************************************************/
 
   #handleCountTokens = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
diff --git a/src/extension/background/APIHandler/AIEmbeddingHandler.ts b/src/extension/background/APIHandler/AIEmbeddingHandler.ts
index af2327d..3cbc8fe 100644
--- a/src/extension/background/APIHandler/AIEmbeddingHandler.ts
+++ b/src/extension/background/APIHandler/AIEmbeddingHandler.ts
@@ -16,7 +16,7 @@ import {
 import APIHelper from './APIHelper'
 import AILlmSession from '../AI/AILlmSession'
 import { nanoid } from 'nanoid'
-import { AICapabilityPromptType } from '#Shared/API/AI'
+import { AICapabilityPromptType, AIModelType } from '#Shared/API/AI'
 
 class AIEmbeddingHandler {
   /* **************************************************************************/
@@ -44,7 +44,7 @@ class AIEmbeddingHandler {
   /* **************************************************************************/
 
   #handleGetCapabilities = async (channel: IPCInflightChannel) => {
-    return APIHelper.handleGetStandardCapabilitiesData(channel, AICapabilityPromptType.Embedding)
+    return APIHelper.handleGetStandardCapabilitiesData(channel, AIModelType.Embedding, AICapabilityPromptType.Embedding)
   }
 
   /* **************************************************************************/
@@ -52,7 +52,7 @@ class AIEmbeddingHandler {
   /* **************************************************************************/
 
   #handleCreate = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardCreatePreflight(channel, AICapabilityPromptType.Embedding, async (
+    return await APIHelper.handleStandardCreatePreflight(channel, AIModelType.Embedding, AICapabilityPromptType.Embedding, async (
       manifest,
       payload,
       props
@@ -73,7 +73,7 @@ class AIEmbeddingHandler {
   /* **************************************************************************/
 
   #handleGet = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Embedding, async (
       manifest,
       payload,
       props
diff --git a/src/extension/background/APIHandler/AILanguageModelHandler.ts b/src/extension/background/APIHandler/AILanguageModelHandler.ts
index e1ec3cd..a14392a 100644
--- a/src/extension/background/APIHandler/AILanguageModelHandler.ts
+++ b/src/extension/background/APIHandler/AILanguageModelHandler.ts
@@ -22,7 +22,7 @@ import AILlmSession from '../AI/AILlmSession'
 import { AIModelManifest } from '#Shared/AIModelManifest'
 import { nanoid } from 'nanoid'
 import { Template } from '@huggingface/jinja'
-import { AICapabilityPromptType, AIRootModelProps } from '#Shared/API/AI'
+import { AICapabilityPromptType, AIRootModelProps, AIModelType } from '#Shared/API/AI'
 
 class AILanguageModelHandler {
   /* **************************************************************************/
@@ -104,7 +104,7 @@ class AILanguageModelHandler {
   /* **************************************************************************/
 
   #handleGetCapabilities = async (channel: IPCInflightChannel) => {
-    return APIHelper.handleGetStandardCapabilitiesData(channel, AICapabilityPromptType.LanguageModel)
+    return APIHelper.handleGetStandardCapabilitiesData(channel, AIModelType.Text, AICapabilityPromptType.LanguageModel)
   }
 
   /* **************************************************************************/
@@ -112,7 +112,7 @@ class AILanguageModelHandler {
   /* **************************************************************************/
 
   #handleCreate = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardCreatePreflight(channel, AICapabilityPromptType.LanguageModel, async (
+    return await APIHelper.handleStandardCreatePreflight(channel, AIModelType.Text, AICapabilityPromptType.LanguageModel, async (
       manifest,
       payload,
       props
@@ -151,7 +151,7 @@ class AILanguageModelHandler {
   /* **************************************************************************/
 
   #handleCountTokens = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
@@ -186,7 +186,7 @@ class AILanguageModelHandler {
    * @returns the stream response
    */
   #handlePrompt = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
diff --git a/src/extension/background/APIHandler/AIRewriterHandler.ts b/src/extension/background/APIHandler/AIRewriterHandler.ts
index 9681b36..d2e8c9a 100644
--- a/src/extension/background/APIHandler/AIRewriterHandler.ts
+++ b/src/extension/background/APIHandler/AIRewriterHandler.ts
@@ -20,7 +20,7 @@ import AILlmSession from '../AI/AILlmSession'
 import { nanoid } from 'nanoid'
 import { AIModelManifest } from '#Shared/AIModelManifest'
 import { Template } from '@huggingface/jinja'
-import { AICapabilityPromptType } from '#Shared/API/AI'
+import { AICapabilityPromptType, AIModelType } from '#Shared/API/AI'
 import { kModelPromptTypeNotSupported } from '#Shared/Errors'
 
 class AIRewriterHandler {
@@ -49,7 +49,7 @@ class AIRewriterHandler {
   /* **************************************************************************/
 
   #handleGetCapabilities = async (channel: IPCInflightChannel) => {
-    return APIHelper.handleGetStandardCapabilitiesData(channel, AICapabilityPromptType.Rewriter)
+    return APIHelper.handleGetStandardCapabilitiesData(channel, AIModelType.Text, AICapabilityPromptType.Rewriter)
   }
 
   /* **************************************************************************/
@@ -57,7 +57,7 @@ class AIRewriterHandler {
   /* **************************************************************************/
 
   #handleCreate = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardCreatePreflight(channel, AICapabilityPromptType.Rewriter, async (
+    return await APIHelper.handleStandardCreatePreflight(channel, AIModelType.Text, AICapabilityPromptType.Rewriter, async (
       manifest,
       payload,
       props
@@ -84,7 +84,7 @@ class AIRewriterHandler {
   /* **************************************************************************/
 
   #handleRewrite = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
diff --git a/src/extension/background/APIHandler/AISummarizerHandler.ts b/src/extension/background/APIHandler/AISummarizerHandler.ts
index 7366499..c593e84 100644
--- a/src/extension/background/APIHandler/AISummarizerHandler.ts
+++ b/src/extension/background/APIHandler/AISummarizerHandler.ts
@@ -20,7 +20,7 @@ import AILlmSession from '../AI/AILlmSession'
 import { nanoid } from 'nanoid'
 import { AIModelManifest } from '#Shared/AIModelManifest'
 import { Template } from '@huggingface/jinja'
-import { AICapabilityPromptType } from '#Shared/API/AI'
+import { AICapabilityPromptType, AIModelType } from '#Shared/API/AI'
 import { kModelPromptTypeNotSupported } from '#Shared/Errors'
 
 class AISummarizerHandler {
@@ -49,7 +49,7 @@ class AISummarizerHandler {
   /* **************************************************************************/
 
   #handleGetCapabilities = async (channel: IPCInflightChannel) => {
-    return APIHelper.handleGetStandardCapabilitiesData(channel, AICapabilityPromptType.Summarizer)
+    return APIHelper.handleGetStandardCapabilitiesData(channel, AIModelType.Text, AICapabilityPromptType.Summarizer)
   }
 
   /* **************************************************************************/
@@ -57,7 +57,7 @@ class AISummarizerHandler {
   /* **************************************************************************/
 
   #handleCreate = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardCreatePreflight(channel, AICapabilityPromptType.Summarizer, async (
+    return await APIHelper.handleStandardCreatePreflight(channel, AIModelType.Text, AICapabilityPromptType.Summarizer, async (
       manifest,
       payload,
       props
@@ -84,7 +84,7 @@ class AISummarizerHandler {
   /* **************************************************************************/
 
   #handleSummarize = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
diff --git a/src/extension/background/APIHandler/AIWriterHandler.ts b/src/extension/background/APIHandler/AIWriterHandler.ts
index 7cd3cbe..3af2451 100644
--- a/src/extension/background/APIHandler/AIWriterHandler.ts
+++ b/src/extension/background/APIHandler/AIWriterHandler.ts
@@ -20,7 +20,7 @@ import AILlmSession from '../AI/AILlmSession'
 import { nanoid } from 'nanoid'
 import { AIModelManifest } from '#Shared/AIModelManifest'
 import { Template } from '@huggingface/jinja'
-import { AICapabilityPromptType } from '#Shared/API/AI'
+import { AICapabilityPromptType, AIModelType } from '#Shared/API/AI'
 import { kModelPromptTypeNotSupported } from '#Shared/Errors'
 
 class AIWriterHandler {
@@ -49,7 +49,7 @@ class AIWriterHandler {
   /* **************************************************************************/
 
   #handleGetCapabilities = async (channel: IPCInflightChannel) => {
-    return APIHelper.handleGetStandardCapabilitiesData(channel, AICapabilityPromptType.Writer)
+    return APIHelper.handleGetStandardCapabilitiesData(channel, AIModelType.Text, AICapabilityPromptType.Writer)
   }
 
   /* **************************************************************************/
@@ -57,7 +57,7 @@ class AIWriterHandler {
   /* **************************************************************************/
 
   #handleCreate = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardCreatePreflight(channel, AICapabilityPromptType.Writer, async (
+    return await APIHelper.handleStandardCreatePreflight(channel, AIModelType.Text, AICapabilityPromptType.Writer, async (
       manifest,
       payload,
       props
@@ -84,7 +84,7 @@ class AIWriterHandler {
   /* **************************************************************************/
 
   #handleWrite = async (channel: IPCInflightChannel) => {
-    return await APIHelper.handleStandardPromptPreflight(channel, async (
+    return await APIHelper.handleStandardPromptPreflight(channel, AIModelType.Text, async (
       manifest,
       payload,
       props
diff --git a/src/extension/background/APIHandler/APIHelper.ts b/src/extension/background/APIHandler/APIHelper.ts
index a5743a6..87cc5e6 100644
--- a/src/extension/background/APIHandler/APIHelper.ts
+++ b/src/extension/background/APIHandler/APIHelper.ts
@@ -1,4 +1,4 @@
-import { clamp, getAIModelId, getEnum } from '#Shared/API/Untrusted/UntrustedParser'
+import { clamp, getNonEmptyString, getEnum } from '#Shared/API/Untrusted/UntrustedParser'
 import {
   getDefaultModel,
   getDefaultModelEngine,
@@ -24,7 +24,8 @@ import {
   AICapabilityAvailability,
   AIRootModelCapabilitiesData,
   AICapabilityPromptType,
-  AIRootModelProps
+  AIRootModelProps,
+  AIModelType
 } from '#Shared/API/AI'
 import { IPCInflightChannel } from '#Shared/IPC/IPCServer'
 import PermissionProvider from '../PermissionProvider'
@@ -44,8 +45,8 @@ class APIHelper {
    * @param modelId: the id of the model
    * @returns the model id or the default
    */
-  async getModelId (modelId: any): Promise<string> {
-    return getAIModelId(modelId, await getDefaultModel())
+  async getModelId (modelId: any, modelType: AIModelType): Promise<string> {
+    return getNonEmptyString(modelId, await getDefaultModel(modelType))
   }
 
   /**
@@ -57,10 +58,6 @@ class APIHelper {
     return getEnum(gpuEngine, AICapabilityGpuEngine, await getDefaultModelEngine())
   }
 
-  /* **************************************************************************/
-  // MARK: Models
-  /* **************************************************************************/
-
   /**
    * Looks to see if a model supports a given prompt type
    * @param manifest: the manifest of the model
@@ -146,16 +143,18 @@ class APIHelper {
   /**
    * Gets the standard capabilities data
    * @param channel: the incoming channel
+   * @param modelType: the type of model we're targeting
    * @param promptType: the type of prompt to check is available
    * @returns the response for the channel
    */
   async handleGetStandardCapabilitiesData (
     channel: IPCInflightChannel,
+    modelType: AIModelType,
     promptType: AICapabilityPromptType,
     configFn?: (manifest: AIModelManifest) => object
   ): Promise<AIRootModelCapabilitiesData> {
     return await this.captureCommonErrorsForResponse(async () => {
-      const modelId = await this.getModelId(channel.payload?.model)
+      const modelId = await this.getModelId(channel.payload?.model, modelType)
 
       // Permission checks & requests
       await PermissionProvider.requestModelPermission(channel, modelId)
@@ -215,12 +214,14 @@ class APIHelper {
   /**
    * Handles a bunch of preflight tasks before a create call
    * @param channel: the incoming IPC channel
+   * @param modelType: the type of model we're targeting
    * @param promptType: the prompt type we should check support for
    * @param postflightFn: a function that can execute a after the preflight calls have been executed
    * @returns the reply from the postflight
    */
   async handleStandardCreatePreflight (
     channel: IPCInflightChannel,
+    modelType: AIModelType,
     promptType: AICapabilityPromptType,
     postflightFn: (
       manifest: AIModelManifest,
@@ -239,7 +240,7 @@ class APIHelper {
     const payload = new UntrustedParser(rawPayload)
     return await this.captureCommonErrorsForResponse(async () => {
       // Values with user-defined defaults
-      const modelId = await this.getModelId(rawPayload?.model)
+      const modelId = await this.getModelId(rawPayload?.model, modelType)
       const gpuEngine = await this.getGpuEngine(rawPayload?.gpuEngine)
 
       // Permission checks & requests
@@ -290,11 +291,13 @@ class APIHelper {
   /**
    * Handles a bunch of preflight tasks before a prompt call
    * @param channel: the incoming IPC channel
+   * @param modelType: the type of model we're targeting
    * @param postflightFn: a function that can execute a after the preflight calls have been executed
    * @returns the reply from the postflight
    */
   async handleStandardPromptPreflight (
     channel: IPCInflightChannel,
+    modelType: AIModelType,
     postflightFn: (
       manifest: AIModelManifest,
       payload: UntrustedParser,
@@ -305,7 +308,7 @@ class APIHelper {
     const payload = new UntrustedParser(rawPayload)
 
     // Values with user-defined defaults
-    const modelId = await this.getModelId(rawPayload?.props?.model)
+    const modelId = await this.getModelId(rawPayload?.props?.model, modelType)
     const gpuEngine = await this.getGpuEngine(rawPayload?.props?.gpuEngine)
 
     // Permission checks & requests
diff --git a/src/extension/background/PermissionProvider/PermissionProvider.ts b/src/extension/background/PermissionProvider/PermissionProvider.ts
index da5e2cc..c0275a6 100644
--- a/src/extension/background/PermissionProvider/PermissionProvider.ts
+++ b/src/extension/background/PermissionProvider/PermissionProvider.ts
@@ -62,7 +62,7 @@ class PermissionProvider {
 
     // The default model might already have permission
     if (config.permissionRequiredForDefaultModel === false) {
-      if (modelId === undefined || modelId === config.defaultAiModel) { return true }
+      if (modelId === undefined || Object.values(config.defaultModels).includes(modelId)) { return true }
     }
 
     // Check if we're a pre-allowed origin
diff --git a/src/extension/ui-options/index.html b/src/extension/ui-options/index.html
index e0d932a..86a58f4 100644
--- a/src/extension/ui-options/index.html
+++ b/src/extension/ui-options/index.html
@@ -16,13 +16,21 @@
             <div class="card-body">
               <h5 class="card-title">Settings</h5>
               <div class="mb-3">
-                <label for="opt-model-default" class="form-label">Default model</label>
-                <select class="form-control" id="opt-model-default">
+                <label for="opt-model-text-default" class="form-label">Default text model</label>
+                <select class="form-control" id="opt-model-text-default">
                 </select>
                 <div class="form-text">
                   The default model to use when a site doesn't specify one.
                 </div>
               </div>
+              <div class="mb-3">
+                <label for="opt-model-embedding-default" class="form-label">Default embedding model</label>
+                <select class="form-control" id="opt-model-embedding-default">
+                </select>
+                <div class="form-text">
+                  The default embedding model to use when a site doesn't specify one.
+                </div>
+              </div>
               <div class="mb-3">
                 <label for="opt-engine-default" class="form-label">Default engine</label>
                 <select class="form-control" id="opt-engine-default">
diff --git a/src/extension/ui-options/index.ts b/src/extension/ui-options/index.ts
index b644851..dac7249 100644
--- a/src/extension/ui-options/index.ts
+++ b/src/extension/ui-options/index.ts
@@ -32,9 +32,10 @@ import {
   getUseMmap,
   setUseMmap
 } from '#Shared/Prefs'
-import Config from '#Shared/Config'
+import config from '#Shared/Config'
 import { AICapabilityGpuEngine } from '#Shared/API/AICapability'
 import { UpdateResult } from '#Shared/Updater'
+import { AIModelType } from '#Shared/API/AI'
 
 /* **************************************************************************/
 // MARK: Settings
@@ -45,13 +46,16 @@ const kBrowserAiModelId = '__browser__'
 function renderDefaultModelOptions (
   $el: HTMLSelectElement,
   selectedModelId: string,
-  useBrowserAI: boolean,
-  modelList: Array<{ id: string, name: string }>
+  modelList: Array<{ id: string, name: string }>,
+  hasBrowserAI: boolean,
+  useBrowserAI: boolean
 ) {
   UI.empty($el)
 
-  if ((window as any).ai?.assistant) {
+  if (hasBrowserAI) {
     modelList = [{ id: kBrowserAiModelId, name: 'Browser AI' }, ...modelList]
+  } else {
+    useBrowserAI = false
   }
 
   for (const model of modelList) {
@@ -99,28 +103,52 @@ async function renderDefaultEngineOptions (
 }
 
 async function renderSettings () {
-  // Default model
-  const $defaultModelOpt = document.getElementById('opt-model-default') as HTMLSelectElement
-  $defaultModelOpt.addEventListener('change', async () => {
-    const modelId = ($defaultModelOpt as HTMLSelectElement).value
+  // TODO: this needs a refactor. We're making multiple http fetch calls to the same endpoint
+
+  // Default text model
+  const $defaultTextModelOpt = document.getElementById('opt-model-text-default') as HTMLSelectElement
+  $defaultTextModelOpt.addEventListener('change', async () => {
+    const modelId = $defaultTextModelOpt.value
 
     if (modelId === kBrowserAiModelId) {
       await setUseBrowserAI(true)
     } else {
       await setUseBrowserAI(false)
-      await setDefaultModel(modelId)
+      await setDefaultModel(AIModelType.Text, modelId)
     }
   })
   ;(async () => {
     const useBrowserAI = await getUseBrowserAI()
-    const defaultModelId = await getDefaultModel()
-    const defaultModelList = [...new Set([defaultModelId, Config.defaultAiModel])].map((modelId) => ({ id: modelId, name: modelId }))
-    renderDefaultModelOptions($defaultModelOpt, defaultModelId, useBrowserAI, defaultModelList)
+    const defaultModelId = await getDefaultModel(AIModelType.Text)
+    const defaultModelList = [
+      ...new Set([defaultModelId, Object.values(config.defaultModels)])
+    ].map((modelId) => ({ id: modelId, name: modelId }))
+    renderDefaultModelOptions($defaultTextModelOpt, defaultModelId, defaultModelList, Boolean((window as any).ai?.assistant), useBrowserAI)
+
+    const res = await fetch('https://aibrow.ai/api/model/list.json')
+    if (res.ok) {
+      const { models } = await res.json()
+      renderDefaultModelOptions($defaultTextModelOpt, defaultModelId, models, Boolean((window as any).ai?.assistant), useBrowserAI)
+    }
+  })()
+
+  // Default embedding model
+  const $defaultEmbeddingModelOpt = document.getElementById('opt-model-embedding-default') as HTMLSelectElement
+  $defaultEmbeddingModelOpt.addEventListener('change', async () => {
+    const modelId = $defaultEmbeddingModelOpt.value
+    await setDefaultModel(AIModelType.Embedding, modelId)
+  })
+  ;(async () => {
+    const defaultModelId = await getDefaultModel(AIModelType.Embedding)
+    const defaultModelList = [
+      ...new Set([defaultModelId, Object.values(config.defaultModels)])
+    ].map((modelId) => ({ id: modelId, name: modelId }))
+    renderDefaultModelOptions($defaultEmbeddingModelOpt, defaultModelId, defaultModelList, false, false)
 
     const res = await fetch('https://aibrow.ai/api/model/list.json')
     if (res.ok) {
       const { models } = await res.json()
-      renderDefaultModelOptions($defaultModelOpt, defaultModelId, useBrowserAI, models)
+      renderDefaultModelOptions($defaultEmbeddingModelOpt, defaultModelId, models, false, false)
     }
   })()
 
diff --git a/src/native/main/APIHandler/LlmSessionAPIHandler.ts b/src/native/main/APIHandler/LlmSessionAPIHandler.ts
index 1433986..394804d 100644
--- a/src/native/main/APIHandler/LlmSessionAPIHandler.ts
+++ b/src/native/main/APIHandler/LlmSessionAPIHandler.ts
@@ -7,7 +7,7 @@ import {
   kLlmSessionCountPromptTokens,
   kLlmSessionDisposePromptSession
 } from '#Shared/NativeAPI/LlmSessionIPC'
-import { AICapabilityGpuEngine, AIRootModelProps } from '#Shared/API/AI'
+import { AICapabilityGpuEngine, AIRootModelProps, AIModelType } from '#Shared/API/AI'
 import { importLlama } from '#R/Llama'
 import { IPCInflightChannel } from '#Shared/IPC/IPCServer'
 import deepEqual from 'fast-deep-equal'
@@ -387,7 +387,7 @@ class LlmSessionAPIHandler {
       try {
         // Extract the options
         const payload = new UntrustedParser(channel.payload)
-        const modelId = payload.getAIModelId('props.model')
+        const modelId = payload.getNonEmptyString('props.model', config.defaultModels[AIModelType.Text])
         const manifest = await AIModelFileSystem.readModelManifest(modelId)
 
         // Extract prompt options
@@ -453,7 +453,7 @@ class LlmSessionAPIHandler {
       try {
         // Extract the options
         const payload = new UntrustedParser(channel.payload)
-        const modelId = payload.getAIModelId('props.model')
+        const modelId = payload.getNonEmptyString('props.model', config.defaultModels[AIModelType.Embedding])
         const manifest = await AIModelFileSystem.readModelManifest(modelId)
 
         // Extract prompt options
@@ -491,7 +491,7 @@ class LlmSessionAPIHandler {
       try {
         // Extract the options
         const payload = new UntrustedParser(channel.payload)
-        const modelId = payload.getAIModelId('props.model')
+        const modelId = payload.getNonEmptyString('props.model', config.defaultModels[AIModelType.Text])
         const input = payload.getString('input')
         const manifest = await AIModelFileSystem.readModelManifest(modelId)
 
diff --git a/src/native/main/index.ts b/src/native/main/index.ts
index 045e778..f813a05 100644
--- a/src/native/main/index.ts
+++ b/src/native/main/index.ts
@@ -60,7 +60,7 @@ async function main () {
     Logger.log('Starting: ai_test')
     Logger.logToConsole = true
 
-    const modelName = config.defaultAiModel
+    const modelName = config.defaultModels.text
 
     if (!await AIModelFileSystem.hasModel(modelName)) {
       Logger.log('Model not available')
diff --git a/src/shared/API/AI.ts b/src/shared/API/AI.ts
index 5057238..caa95ba 100644
--- a/src/shared/API/AI.ts
+++ b/src/shared/API/AI.ts
@@ -26,6 +26,11 @@ export enum AICapabilityPromptType {
   Rewriter = 'rewriter'
 }
 
+export enum AIModelType {
+  Text = 'text',
+  Embedding = 'embedding'
+}
+
 /* **************************************************************************/
 // MARK: Core capabilities
 /* **************************************************************************/
diff --git a/src/shared/API/Untrusted/UntrustedObject.ts b/src/shared/API/Untrusted/UntrustedObject.ts
index 7006667..4950924 100644
--- a/src/shared/API/Untrusted/UntrustedObject.ts
+++ b/src/shared/API/Untrusted/UntrustedObject.ts
@@ -7,7 +7,6 @@ import {
   getBool,
   getAny,
   getRange,
-  getAIModelId,
   getAILanguageModelInitialPrompts,
   getAILanguageModelPrompts
 } from './UntrustedParser'
@@ -67,14 +66,6 @@ class UntrustedParser {
     return getRange(this.#get(path), range)
   }
 
-  /* **************************************************************************/
-  // MARK: AI types
-  /* **************************************************************************/
-
-  getAIModelId (path: string): string {
-    return getAIModelId(this.#get(path))
-  }
-
   /* **************************************************************************/
   // MARK: AI Language model
   /* **************************************************************************/
diff --git a/src/shared/API/Untrusted/UntrustedParser.ts b/src/shared/API/Untrusted/UntrustedParser.ts
index 1786c70..11bbeed 100644
--- a/src/shared/API/Untrusted/UntrustedParser.ts
+++ b/src/shared/API/Untrusted/UntrustedParser.ts
@@ -4,7 +4,6 @@ import {
   AILanguageModelPrompt,
   AILanguageModelPromptRole
 } from '#Shared/API/AILanguageModel/AILanguageModelTypes'
-import config from '#Shared/Config'
 
 /* **************************************************************************/
 // MARK: Base types
@@ -43,14 +42,6 @@ export function getRange (val: any, range: [number, number, number]) {
   return clamp(getNumber(val, defaultVal), min, max)
 }
 
-/* **************************************************************************/
-// MARK: AI types
-/* **************************************************************************/
-
-export function getAIModelId (modelId: any, defaultVal: string = config.defaultAiModel): string {
-  return getNonEmptyString(modelId, defaultVal) as string
-}
-
 /* **************************************************************************/
 // MARK: AI Language model
 /* **************************************************************************/
diff --git a/src/shared/Config.ts b/src/shared/Config.ts
index d5f6649..ded194f 100644
--- a/src/shared/Config.ts
+++ b/src/shared/Config.ts
@@ -1,4 +1,6 @@
-type Config = {
+import { AIModelType } from './API/AI'
+
+export type Config = {
   version: string,
 
   native: {
@@ -17,7 +19,10 @@ type Config = {
     installHelperUrl: string
   }
 
-  defaultAiModel: string
+  defaultModels: {
+    [AIModelType.Text]: string
+    [AIModelType.Embedding]: string
+  }
   modelMinMachineScore: number
   permissionRequiredForDefaultModel: boolean
   permissionAlwaysAllowedOrigins: string[]
@@ -28,5 +33,5 @@ type Config = {
   updateCheckInterval: number
 }
 
-const config = (process.env as any).AZ_CONFIG as Config
+export const config = (process.env as any).AZ_CONFIG as Config
 export default config
diff --git a/src/shared/Prefs.ts b/src/shared/Prefs.ts
index 4531e6f..a0e6a2e 100644
--- a/src/shared/Prefs.ts
+++ b/src/shared/Prefs.ts
@@ -1,4 +1,5 @@
-import Config from './Config'
+import config from './Config'
+import { AIModelType } from './API/AI'
 
 /* **************************************************************************/
 // MARK: Base
@@ -38,9 +39,9 @@ export async function setLastUpdateTime (time: number = Date.now()) { return set
 // MARK: Models
 /* **************************************************************************/
 
-const kDefaultModelKey = `${kPrefKeyPrefix}:defaultModel`
-export async function getDefaultModel () { return getPref(kDefaultModelKey, Config.defaultAiModel) }
-export async function setDefaultModel (modelId: string) { return setPref(kDefaultModelKey, modelId) }
+const kDefaultModelsPrefixKey = `${kPrefKeyPrefix}:defaultModels:`
+export async function getDefaultModel (modelType: AIModelType) { return getPref(`${kDefaultModelsPrefixKey}${modelType}`, config.defaultModels[modelType]) }
+export async function setDefaultModel (modelType: AIModelType, modelId: string) { return setPref(`${kDefaultModelsPrefixKey}${modelType}`, modelId) }
 
 const kDefaultUseBrowserAIKey = `${kPrefKeyPrefix}:useBrowserAI`
 export async function getUseBrowserAI () { return getPref(kDefaultUseBrowserAIKey, false) }