diff --git a/frontend/components/ui/inputs/embedding-model.tsx b/frontend/components/ui/inputs/embedding-model.tsx
index ded138ad..33bda350 100644
--- a/frontend/components/ui/inputs/embedding-model.tsx
+++ b/frontend/components/ui/inputs/embedding-model.tsx
@@ -34,20 +34,25 @@ export const EmbeddingModelInput = ({
   modelsData,
   currentProvider = "openai",
 }: EmbeddingModelInputProps) => {
+  const isDisabled = Boolean(disabled);
+  const tooltipMessage = isDisabled
+    ? "Locked to keep embeddings consistent"
+    : "Choose the embedding model for ingest and retrieval";
+
   return (
     <LabelWrapper
       helperText="Model used for knowledge ingest and retrieval"
       id="embedding-model-select"
       label="Embedding model"
     >
-      <Select disabled={disabled} value={value} onValueChange={onChange}>
+      <Select disabled={isDisabled} value={value} onValueChange={onChange}>
         <Tooltip delayDuration={0}>
           <TooltipTrigger asChild>
-            <SelectTrigger disabled id="embedding-model-select">
+            <SelectTrigger disabled={isDisabled} id="embedding-model-select">
               <SelectValue placeholder="Select an embedding model" />
             </SelectTrigger>
           </TooltipTrigger>
-          <TooltipContent>Locked to keep embeddings consistent</TooltipContent>
+          <TooltipContent>{tooltipMessage}</TooltipContent>
         </Tooltip>
         <SelectContent>
           <ModelSelectItems
diff --git a/frontend/src/app/settings/page.tsx b/frontend/src/app/settings/page.tsx
index 148da3bd..728a7861 100644
--- a/frontend/src/app/settings/page.tsx
+++ b/frontend/src/app/settings/page.tsx
@@ -243,6 +243,8 @@ function KnowledgeSourcesPage() {
     updateFlowSettingMutation.mutate({ embedding_model: newModel });
   };
 
+  const isEmbeddingModelSelectDisabled = updateFlowSettingMutation.isPending;
+
   // Update chunk size setting with debounce
   const handleChunkSizeChange = (value: string) => {
     const numValue = Math.max(0, parseInt(value) || 0);
@@ -1029,8 +1031,7 @@ function KnowledgeSourcesPage() {
                 label="Embedding model"
               >
                 <Select
-                  // Disabled until API supports multiple embedding models
-                  disabled={true}
+                  disabled={isEmbeddingModelSelectDisabled}
                   value={
                     settings.knowledge?.embedding_model ||
                     modelsData?.embedding_models?.find((m) => m.default)
@@ -1041,12 +1042,17 @@ function KnowledgeSourcesPage() {
                 >
                   <Tooltip>
                     <TooltipTrigger asChild>
-                      <SelectTrigger disabled id="embedding-model-select">
+                      <SelectTrigger
+                        disabled={isEmbeddingModelSelectDisabled}
+                        id="embedding-model-select"
+                      >
                         <SelectValue placeholder="Select an embedding model" />
                       </SelectTrigger>
                     </TooltipTrigger>
                     <TooltipContent>
-                      Locked to keep embeddings consistent
+                      {isEmbeddingModelSelectDisabled
+                        ? "Please wait while we update your settings"
+                        : "Choose the embedding model used for new ingests"}
                     </TooltipContent>
                   </Tooltip>
                   <SelectContent>