diff --git a/frontend/app/onboarding/_components/model-selector.tsx b/frontend/app/onboarding/_components/model-selector.tsx
index 4939951a..498bcca6 100644
--- a/frontend/app/onboarding/_components/model-selector.tsx
+++ b/frontend/app/onboarding/_components/model-selector.tsx
@@ -89,7 +89,6 @@ export function ModelSelector({
   return (
     <Popover open={open} onOpenChange={setOpen} modal={false}>
       <PopoverTrigger asChild>
-        {/** biome-ignore lint/a11y/useSemanticElements: has to be a Button */}
         <Button
           variant="outline"
           role="combobox"
@@ -150,28 +149,39 @@ export function ModelSelector({
                     </div>
                   }
                 >
-                  {group.options.map((option) => (
+                  {group.options.length === 0 ? (
                     <CommandItem
-                      key={option.value}
-                      value={option.value}
-                      onSelect={(currentValue) => {
-                        if (currentValue !== value) {
-                          onValueChange(currentValue, option.provider);
-                        }
-                        setOpen(false);
-                      }}
+                      disabled
+                      className="text-muted-foreground ml-6"
                     >
-                      <CheckIcon
-                        className={cn(
-                          "mr-2 h-4 w-4",
-                          value === option.value ? "opacity-100" : "opacity-0",
-                        )}
-                      />
-                      <div className="flex items-center gap-2">
-                        {option.label}
-                      </div>
+                      No models available
                     </CommandItem>
-                  ))}
+                  ) : (
+                    group.options.map((option) => (
+                      <CommandItem
+                        key={option.value}
+                        value={option.value}
+                        onSelect={(currentValue) => {
+                          if (currentValue !== value) {
+                            onValueChange(currentValue, option.provider);
+                          }
+                          setOpen(false);
+                        }}
+                      >
+                        <CheckIcon
+                          className={cn(
+                            "mr-2 h-4 w-4",
+                            value === option.value
+                              ? "opacity-100"
+                              : "opacity-0",
+                          )}
+                        />
+                        <div className="flex items-center gap-2">
+                          {option.label}
+                        </div>
+                      </CommandItem>
+                    ))
+                  )}
                 </CommandGroup>
               ))
             ) : (
diff --git a/frontend/app/settings/page.tsx b/frontend/app/settings/page.tsx
index 9d48133b..7832b464 100644
--- a/frontend/app/settings/page.tsx
+++ b/frontend/app/settings/page.tsx
@@ -204,8 +204,7 @@ function KnowledgeSourcesPage() {
         ...model,
         provider: provider.provider,
       })),
-    }))
-    .filter((provider) => provider.options.length > 0);
+    }));
 
   // Build grouped embedding model options from all configured providers (excluding Anthropic)
   const groupedEmbeddingModels = [
@@ -239,8 +238,7 @@ function KnowledgeSourcesPage() {
         ...model,
         provider: provider.provider,
       })),
-    }))
-    .filter((provider) => provider.options.length > 0);
+    }));
 
   const isLoadingAnyLlmModels =
     openaiLoading || anthropicLoading || ollamaLoading || watsonxLoading;