diff --git a/apps/desktop/src/components/main/body/ai.tsx b/apps/desktop/src/components/main/body/ai.tsx
index 11549a289f..5b49998fd1 100644
--- a/apps/desktop/src/components/main/body/ai.tsx
+++ b/apps/desktop/src/components/main/body/ai.tsx
@@ -60,42 +60,38 @@ function AIView({ tab }: { tab: Extract<Tab, { type: "ai" }> }) {
     [updateAiTabState, tab],
   );
 
-  const headerAction = (
-    <div className="flex gap-1">
-      <Button
-        variant="ghost"
-        size="sm"
-        onClick={() => setActiveTab("transcription")}
-        className={cn([
-          "gap-1.5 h-7 px-2",
-          activeTab === "transcription" && "bg-neutral-200",
-        ])}
-      >
-        <AudioLinesIcon size={14} />
-        <span className="text-xs">Transcription</span>
-      </Button>
-      <Button
-        variant="ghost"
-        size="sm"
-        onClick={() => setActiveTab("intelligence")}
-        className={cn([
-          "gap-1.5 h-7 px-2",
-          activeTab === "intelligence" && "bg-neutral-200",
-        ])}
-      >
-        <SparklesIcon size={14} />
-        <span className="text-xs">Intelligence</span>
-      </Button>
-    </div>
-  );
-
   return (
-    <div className="flex-1 w-full overflow-y-auto scrollbar-hide p-6">
-      {activeTab === "transcription" ? (
-        <STT headerAction={headerAction} />
-      ) : (
-        <LLM headerAction={headerAction} />
-      )}
+    <div className="flex flex-col flex-1 w-full overflow-hidden">
+      <div className="flex gap-1 px-6 pt-6 pb-2">
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={() => setActiveTab("transcription")}
+          className={cn([
+            "gap-1.5 h-7 px-2 border border-transparent",
+            activeTab === "transcription" &&
+              "bg-neutral-100 border-neutral-200",
+          ])}
+        >
+          <AudioLinesIcon size={14} />
+          <span className="text-xs">Transcription</span>
+        </Button>
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={() => setActiveTab("intelligence")}
+          className={cn([
+            "gap-1.5 h-7 px-2 border border-transparent",
+            activeTab === "intelligence" && "bg-neutral-100 border-neutral-200",
+          ])}
+        >
+          <SparklesIcon size={14} />
+          <span className="text-xs">Intelligence</span>
+        </Button>
+      </div>
+      <div className="flex-1 w-full overflow-y-auto scrollbar-hide px-6 pb-6">
+        {activeTab === "transcription" ? <STT /> : <LLM />}
+      </div>
     </div>
   );
 }
diff --git a/apps/desktop/src/components/main/sidebar/banner/component.tsx b/apps/desktop/src/components/main/sidebar/banner/component.tsx
index 94b463082f..cea0abc572 100644
--- a/apps/desktop/src/components/main/sidebar/banner/component.tsx
+++ b/apps/desktop/src/components/main/sidebar/banner/component.tsx
@@ -13,7 +13,7 @@ export function Banner({
   onDismiss?: () => void;
 }) {
   return (
-    <div className="overflow-hidden px-1 py-2">
+    <div className="overflow-hidden p-1">
       <div
         className={cn([
           "relative group overflow-hidden rounded-lg",
@@ -27,7 +27,12 @@ export function Banner({
             size="icon"
             variant="ghost"
             aria-label="Dismiss banner"
-            className="absolute top-1 right-1 opacity-0 group-hover:opacity-10 hover:!opacity-100 transition-all duration-200"
+            className={cn([
+              "absolute top-1.5 right-1.5 size-6",
+              "opacity-0 group-hover:opacity-50 hover:!opacity-100",
+              "hover:bg-neutral-200",
+              "transition-all duration-200",
+            ])}
           >
             <X className="w-3.5 h-3.5" />
           </Button>
diff --git a/apps/desktop/src/components/settings/ai/llm/configure.tsx b/apps/desktop/src/components/settings/ai/llm/configure.tsx
index d78ab6b2d8..7589c50207 100644
--- a/apps/desktop/src/components/settings/ai/llm/configure.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/configure.tsx
@@ -1,7 +1,3 @@
-import { useForm } from "@tanstack/react-form";
-import { useEffect } from "react";
-
-import { type AIProvider, aiProviderSchema } from "@hypr/store";
 import {
   Accordion,
   AccordionContent,
@@ -12,13 +8,13 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
 
 import { useBillingAccess } from "../../../../billing";
-import { FormField, StyledStreamdown, useProvider } from "../shared";
+import { NonHyprProviderCard, StyledStreamdown } from "../shared";
 import { ProviderId, PROVIDERS } from "./shared";
 
 export function ConfigureProviders() {
   return (
     <div className="flex flex-col gap-3">
-      <h3 className="text-sm font-semibold">Configure Providers</h3>
+      <h3 className="text-md font-semibold">Configure Providers</h3>
       <Accordion type="single" collapsible className="space-y-3">
         <HyprProviderCard
           providerId="hyprnote"
@@ -29,7 +25,13 @@ export function ConfigureProviders() {
         />
         {PROVIDERS.filter((provider) => provider.id !== "hyprnote").map(
           (provider) => (
-            <NonHyprProviderCard key={provider.id} config={provider} />
+            <NonHyprProviderCard
+              key={provider.id}
+              config={provider}
+              providerType="llm"
+              providers={PROVIDERS}
+              providerContext={<ProviderContext providerId={provider.id} />}
+            />
           ),
         )}
       </Accordion>
@@ -37,118 +39,6 @@ export function ConfigureProviders() {
   );
 }
 
-function NonHyprProviderCard({
-  config,
-}: {
-  config: (typeof PROVIDERS)[number];
-}) {
-  const billing = useBillingAccess();
-  const [provider, setProvider] = useProvider(config.id);
-  const locked = config.requiresPro && !billing.isPro;
-
-  useEffect(() => {
-    if (!provider && config.baseUrl && !config.apiKey) {
-      setProvider({
-        type: "llm",
-        base_url: config.baseUrl,
-        api_key: "",
-      });
-    }
-  }, [provider, config.baseUrl, config.apiKey, setProvider]);
-
-  const form = useForm({
-    onSubmit: ({ value }) => setProvider(value),
-    defaultValues:
-      provider ??
-      ({
-        type: "llm",
-        base_url: config.baseUrl ?? "",
-        api_key: "",
-      } satisfies AIProvider),
-    listeners: {
-      onChange: ({ formApi }) => {
-        queueMicrotask(() => {
-          const {
-            form: { errors },
-          } = formApi.getAllErrors();
-          if (errors.length > 0) {
-            console.log(errors);
-          }
-
-          formApi.handleSubmit();
-        });
-      },
-    },
-    validators: { onChange: aiProviderSchema },
-  });
-
-  return (
-    <AccordionItem
-      value={config.id}
-      className="rounded-xl border-2 border-dashed bg-neutral-50"
-      disabled={locked}
-    >
-      <AccordionTrigger
-        className={cn([
-          "capitalize gap-2 px-4",
-          locked && "cursor-not-allowed opacity-30",
-        ])}
-      >
-        <div className="flex items-center gap-2">
-          {config.icon}
-          <span>{config.displayName}</span>
-        </div>
-      </AccordionTrigger>
-      <AccordionContent className="px-4 space-y-6">
-        <ProviderContext providerId={config.id} />
-
-        <form
-          className="space-y-4"
-          onSubmit={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-          }}
-        >
-          {!config.baseUrl && (
-            <form.Field name="base_url">
-              {(field) => (
-                <FormField field={field} label="Base URL" icon="mdi:web" />
-              )}
-            </form.Field>
-          )}
-          {config?.apiKey && (
-            <form.Field name="api_key">
-              {(field) => (
-                <FormField
-                  field={field}
-                  label="API Key"
-                  icon="mdi:key"
-                  placeholder="Enter your API key"
-                  type="password"
-                />
-              )}
-            </form.Field>
-          )}
-          {config.baseUrl && (
-            <details className="space-y-4 pt-2">
-              <summary className="text-xs cursor-pointer text-neutral-600 hover:text-neutral-900 hover:underline">
-                Advanced
-              </summary>
-              <div className="mt-4">
-                <form.Field name="base_url">
-                  {(field) => (
-                    <FormField field={field} label="Base URL" icon="mdi:web" />
-                  )}
-                </form.Field>
-              </div>
-            </details>
-          )}
-        </form>
-      </AccordionContent>
-    </AccordionItem>
-  );
-}
-
 function HyprProviderCard({
   providerId,
   providerName,
@@ -164,8 +54,11 @@ function HyprProviderCard({
   return (
     <AccordionItem
       value={providerId}
-      className="rounded-xl border-2 border-dashed bg-neutral-50"
       disabled={locked}
+      className={cn([
+        "rounded-xl border-2 bg-neutral-50",
+        true ? "border-solid border-neutral-300" : "border-dashed",
+      ])}
     >
       <AccordionTrigger
         className={cn([
diff --git a/apps/desktop/src/components/settings/ai/llm/index.tsx b/apps/desktop/src/components/settings/ai/llm/index.tsx
index 0b57a226ed..b10b57db39 100644
--- a/apps/desktop/src/components/settings/ai/llm/index.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/index.tsx
@@ -1,12 +1,10 @@
 import { ConfigureProviders } from "./configure";
-import { HealthCheckForAvailability } from "./health";
 import { SelectProviderAndModel } from "./select";
 
-export function LLM({ headerAction }: { headerAction?: React.ReactNode } = {}) {
+export function LLM() {
   return (
-    <div className="space-y-6">
-      <HealthCheckForAvailability />
-      <SelectProviderAndModel headerAction={headerAction} />
+    <div className="space-y-6 mt-4">
+      <SelectProviderAndModel />
       <ConfigureProviders />
     </div>
   );
diff --git a/apps/desktop/src/components/settings/ai/llm/select.tsx b/apps/desktop/src/components/settings/ai/llm/select.tsx
index 16b905d2fe..df2b8c7a14 100644
--- a/apps/desktop/src/components/settings/ai/llm/select.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/select.tsx
@@ -28,9 +28,7 @@ import { ModelCombobox } from "../shared/model-combobox";
 import { HealthCheckForConnection } from "./health";
 import { PROVIDERS } from "./shared";
 
-export function SelectProviderAndModel({
-  headerAction,
-}: { headerAction?: React.ReactNode } = {}) {
+export function SelectProviderAndModel() {
   const configuredProviders = useConfiguredMapping();
 
   const { current_llm_model, current_llm_provider } = useConfigValues([
@@ -77,10 +75,7 @@ export function SelectProviderAndModel({
 
   return (
     <div className="flex flex-col gap-3">
-      <div className="flex items-center justify-between">
-        <h3 className="text-md font-semibold">Model being used</h3>
-        {headerAction}
-      </div>
+      <h3 className="text-md font-semibold">Model being used</h3>
       <div
         className={cn([
           "flex flex-col gap-4",
@@ -177,6 +172,15 @@ export function SelectProviderAndModel({
             <HealthCheckForConnection />
           )}
         </div>
+
+        {(!current_llm_provider || !current_llm_model) && (
+          <div className="flex items-center gap-2 pt-2 border-t border-red-200">
+            <span className="text-sm text-red-600">
+              <strong className="font-medium">Language model</strong> is needed
+              to make Hyprnote summarize and chat about your conversations.
+            </span>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/apps/desktop/src/components/settings/ai/shared/index.tsx b/apps/desktop/src/components/settings/ai/shared/index.tsx
index 471becc815..104b643621 100644
--- a/apps/desktop/src/components/settings/ai/shared/index.tsx
+++ b/apps/desktop/src/components/settings/ai/shared/index.tsx
@@ -1,9 +1,15 @@
 import { Icon } from "@iconify-icon/react";
-import { type AnyFieldApi } from "@tanstack/react-form";
+import { type AnyFieldApi, useForm } from "@tanstack/react-form";
+import type { ReactNode } from "react";
 import { Streamdown } from "streamdown";
 
 import type { AIProvider } from "@hypr/store";
 import { aiProviderSchema } from "@hypr/store";
+import {
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@hypr/ui/components/ui/accordion";
 import {
   InputGroup,
   InputGroupAddon,
@@ -12,10 +18,182 @@ import {
 } from "@hypr/ui/components/ui/input-group";
 import { cn } from "@hypr/utils";
 
+import { useBillingAccess } from "../../../../billing";
 import * as settings from "../../../../store/tinybase/settings";
 
 export * from "./model-combobox";
 
+type ProviderType = "stt" | "llm";
+
+type ProviderConfig = {
+  id: string;
+  displayName: string;
+  icon: ReactNode;
+  badge?: string | null;
+  baseUrl?: string;
+  apiKey?: boolean;
+  disabled?: boolean;
+  requiresPro?: boolean;
+};
+
+function useIsProviderConfigured(
+  providerId: string,
+  providerType: ProviderType,
+  providers: readonly ProviderConfig[],
+) {
+  const query =
+    providerType === "stt"
+      ? settings.QUERIES.sttProviders
+      : settings.QUERIES.llmProviders;
+
+  const configuredProviders = settings.UI.useResultTable(
+    query,
+    settings.STORE_ID,
+  );
+  const providerDef = providers.find((p) => p.id === providerId);
+  const config = configuredProviders[providerId];
+
+  if (!config) {
+    return false;
+  }
+
+  if (providerType === "stt") {
+    if (!providerDef?.baseUrl && !config.base_url) {
+      return false;
+    }
+    if (!config.api_key) {
+      return false;
+    }
+  } else {
+    if (!config.base_url) {
+      return false;
+    }
+    if (providerDef?.apiKey && !config.api_key) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+export function NonHyprProviderCard({
+  config,
+  providerType,
+  providers,
+  providerContext,
+}: {
+  config: ProviderConfig;
+  providerType: ProviderType;
+  providers: readonly ProviderConfig[];
+  providerContext?: ReactNode;
+}) {
+  const billing = useBillingAccess();
+  const [provider, setProvider] = useProvider(config.id);
+  const locked = config.requiresPro && !billing.isPro;
+  const isConfigured = useIsProviderConfigured(
+    config.id,
+    providerType,
+    providers,
+  );
+
+  const showApiKey = providerType === "stt" || config.apiKey;
+
+  const form = useForm({
+    onSubmit: ({ value }) => setProvider(value),
+    defaultValues:
+      provider ??
+      ({
+        type: providerType,
+        base_url: config.baseUrl ?? "",
+        api_key: "",
+      } satisfies AIProvider),
+    listeners: {
+      onChange: ({ formApi }) => {
+        queueMicrotask(() => {
+          formApi.handleSubmit();
+        });
+      },
+    },
+    validators: { onChange: aiProviderSchema },
+  });
+
+  return (
+    <AccordionItem
+      disabled={config.disabled || locked}
+      value={config.id}
+      className={cn([
+        "rounded-xl border-2 bg-neutral-50",
+        isConfigured ? "border-solid border-neutral-300" : "border-dashed",
+      ])}
+    >
+      <AccordionTrigger
+        className={cn([
+          "capitalize gap-2 px-4",
+          (config.disabled || locked) && "cursor-not-allowed opacity-30",
+        ])}
+      >
+        <div className="flex items-center gap-2">
+          {config.icon}
+          <span>{config.displayName}</span>
+          {config.badge && (
+            <span className="text-xs text-neutral-500 font-light border border-neutral-300 rounded-full px-2">
+              {config.badge}
+            </span>
+          )}
+        </div>
+      </AccordionTrigger>
+      <AccordionContent
+        className={cn(["px-4", providerType === "llm" && "space-y-6"])}
+      >
+        {providerContext}
+
+        <form
+          className="space-y-4"
+          onSubmit={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+          }}
+        >
+          {!config.baseUrl && (
+            <form.Field name="base_url">
+              {(field) => (
+                <FormField field={field} label="Base URL" icon="mdi:web" />
+              )}
+            </form.Field>
+          )}
+          {showApiKey && (
+            <form.Field name="api_key">
+              {(field) => (
+                <FormField
+                  field={field}
+                  label="API Key"
+                  icon="mdi:key"
+                  placeholder="Enter your API key"
+                  type="password"
+                />
+              )}
+            </form.Field>
+          )}
+          {config.baseUrl && (
+            <details className="space-y-4 pt-2">
+              <summary className="text-xs cursor-pointer text-neutral-600 hover:text-neutral-900 hover:underline">
+                Advanced
+              </summary>
+              <div className="mt-4">
+                <form.Field name="base_url">
+                  {(field) => (
+                    <FormField field={field} label="Base URL" icon="mdi:web" />
+                  )}
+                </form.Field>
+              </div>
+            </details>
+          )}
+        </form>
+      </AccordionContent>
+    </AccordionItem>
+  );
+}
+
 const streamdownComponents = {
   ul: (props: React.HTMLAttributes<HTMLUListElement>) => {
     return (
@@ -57,7 +235,7 @@ export function StyledStreamdown({
   );
 }
 
-export function useProvider(id: string) {
+function useProvider(id: string) {
   const providerRow = settings.UI.useRow("ai_providers", id, settings.STORE_ID);
   const setProvider = settings.UI.useSetPartialRowCallback(
     "ai_providers",
@@ -71,7 +249,7 @@ export function useProvider(id: string) {
   return [data, setProvider] as const;
 }
 
-export function FormField({
+function FormField({
   field,
   label,
   icon,
diff --git a/apps/desktop/src/components/settings/ai/stt/configure.tsx b/apps/desktop/src/components/settings/ai/stt/configure.tsx
index bff8853f31..f63006c521 100644
--- a/apps/desktop/src/components/settings/ai/stt/configure.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/configure.tsx
@@ -1,5 +1,4 @@
 import { Icon } from "@iconify-icon/react";
-import { useForm } from "@tanstack/react-form";
 import { useQuery } from "@tanstack/react-query";
 import { openPath } from "@tauri-apps/plugin-opener";
 import { arch } from "@tauri-apps/plugin-os";
@@ -10,7 +9,6 @@ import {
   events as localSttEvents,
   type SupportedSttModel,
 } from "@hypr/plugin-local-stt";
-import { type AIProvider, aiProviderSchema } from "@hypr/store";
 import {
   Accordion,
   AccordionContent,
@@ -24,13 +22,13 @@ import { useBillingAccess } from "../../../../billing";
 import { useListener } from "../../../../contexts/listener";
 import { useIsMacos } from "../../../../hooks/usePlatform";
 import * as settings from "../../../../store/tinybase/settings";
-import { FormField, StyledStreamdown, useProvider } from "../shared";
+import { NonHyprProviderCard, StyledStreamdown } from "../shared";
 import { ProviderId, PROVIDERS, sttModelQueries } from "./shared";
 
 export function ConfigureProviders() {
   return (
     <div className="flex flex-col gap-3">
-      <h3 className="text-sm font-semibold">Configure Providers</h3>
+      <h3 className="text-md font-semibold">Configure Providers</h3>
       <Accordion type="single" collapsible className="space-y-3">
         <HyprProviderCard
           providerId="hyprnote"
@@ -42,7 +40,13 @@ export function ConfigureProviders() {
         />
         {PROVIDERS.filter((provider) => provider.id !== "hyprnote").map(
           (provider) => (
-            <NonHyprProviderCard key={provider.id} config={provider} />
+            <NonHyprProviderCard
+              key={provider.id}
+              config={provider}
+              providerType="stt"
+              providers={PROVIDERS}
+              providerContext={<ProviderContext providerId={provider.id} />}
+            />
           ),
         )}
       </Accordion>
@@ -50,111 +54,6 @@ export function ConfigureProviders() {
   );
 }
 
-function NonHyprProviderCard({
-  config,
-}: {
-  config: (typeof PROVIDERS)[number];
-}) {
-  const billing = useBillingAccess();
-  const [provider, setProvider] = useProvider(config.id);
-  const locked = config.requiresPro && !billing.isPro;
-
-  const form = useForm({
-    onSubmit: ({ value }) => setProvider(value),
-    defaultValues:
-      provider ??
-      ({
-        type: "stt",
-        base_url: config.baseUrl ?? "",
-        api_key: "",
-      } satisfies AIProvider),
-    listeners: {
-      onChange: ({ formApi }) => {
-        queueMicrotask(() => {
-          const {
-            form: { errors },
-          } = formApi.getAllErrors();
-          if (errors.length > 0) {
-            console.log(errors);
-          }
-
-          formApi.handleSubmit();
-        });
-      },
-    },
-    validators: { onChange: aiProviderSchema },
-  });
-
-  return (
-    <AccordionItem
-      disabled={config.disabled || locked}
-      value={config.id}
-      className="rounded-xl border-2 border-dashed bg-neutral-50"
-    >
-      <AccordionTrigger
-        className={cn([
-          "capitalize gap-2 px-4",
-          (config.disabled || locked) && "cursor-not-allowed opacity-30",
-        ])}
-      >
-        <div className="flex items-center gap-2">
-          {config.icon}
-          <span>{config.displayName}</span>
-          {config.badge && (
-            <span className="text-xs text-neutral-500 font-light border border-neutral-300 rounded-full px-2">
-              {config.badge}
-            </span>
-          )}
-        </div>
-      </AccordionTrigger>
-      <AccordionContent className="px-4">
-        <ProviderContext providerId={config.id} />
-
-        <form
-          className="space-y-4"
-          onSubmit={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-          }}
-        >
-          {!config.baseUrl && (
-            <form.Field name="base_url">
-              {(field) => (
-                <FormField field={field} label="Base URL" icon="mdi:web" />
-              )}
-            </form.Field>
-          )}
-          <form.Field name="api_key">
-            {(field) => (
-              <FormField
-                field={field}
-                label="API Key"
-                icon="mdi:key"
-                placeholder="Enter your API key"
-                type="password"
-              />
-            )}
-          </form.Field>
-          {config.baseUrl && (
-            <details className="space-y-4 pt-2">
-              <summary className="text-xs cursor-pointer text-neutral-600 hover:text-neutral-900 hover:underline">
-                Advanced
-              </summary>
-              <div className="mt-4">
-                <form.Field name="base_url">
-                  {(field) => (
-                    <FormField field={field} label="Base URL" icon="mdi:web" />
-                  )}
-                </form.Field>
-              </div>
-            </details>
-          )}
-        </form>
-      </AccordionContent>
-    </AccordionItem>
-  );
-}
-
 function HyprProviderCard({
   providerId,
   providerName,
@@ -177,7 +76,10 @@ function HyprProviderCard({
   return (
     <AccordionItem
       value={providerId}
-      className="rounded-xl border-2 border-dashed bg-neutral-50"
+      className={cn([
+        "rounded-xl border-2 bg-neutral-50",
+        true ? "border-solid border-neutral-300" : "border-dashed",
+      ])}
     >
       <AccordionTrigger className={cn(["capitalize gap-2 px-4"])}>
         <div className="flex items-center gap-2">
diff --git a/apps/desktop/src/components/settings/ai/stt/index.tsx b/apps/desktop/src/components/settings/ai/stt/index.tsx
index c8bca034b5..6769341fe5 100644
--- a/apps/desktop/src/components/settings/ai/stt/index.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/index.tsx
@@ -1,12 +1,10 @@
 import { ConfigureProviders } from "./configure";
-import { HealthCheckForAvailability } from "./health";
 import { SelectProviderAndModel } from "./select";
 
-export function STT({ headerAction }: { headerAction?: React.ReactNode } = {}) {
+export function STT() {
   return (
-    <div className="space-y-6">
-      <HealthCheckForAvailability />
-      <SelectProviderAndModel headerAction={headerAction} />
+    <div className="space-y-6 mt-4">
+      <SelectProviderAndModel />
       <ConfigureProviders />
     </div>
   );
diff --git a/apps/desktop/src/components/settings/ai/stt/select.tsx b/apps/desktop/src/components/settings/ai/stt/select.tsx
index ee0e8f47bc..783ac55571 100644
--- a/apps/desktop/src/components/settings/ai/stt/select.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/select.tsx
@@ -24,9 +24,7 @@ import {
   sttModelQueries,
 } from "./shared";
 
-export function SelectProviderAndModel({
-  headerAction,
-}: { headerAction?: React.ReactNode } = {}) {
+export function SelectProviderAndModel() {
   const { current_stt_provider, current_stt_model } = useConfigValues([
     "current_stt_provider",
     "current_stt_model",
@@ -73,10 +71,7 @@ export function SelectProviderAndModel({
 
   return (
     <div className="flex flex-col gap-3">
-      <div className="flex items-center justify-between">
-        <h3 className="text-md font-semibold">Model being used</h3>
-        {headerAction}
-      </div>
+      <h3 className="text-md font-semibold">Model being used</h3>
       <div
         className={cn([
           "flex flex-col gap-4",
@@ -208,6 +203,15 @@ export function SelectProviderAndModel({
             <HealthCheckForConnection />
           )}
         </div>
+
+        {(!current_stt_provider || !current_stt_model) && (
+          <div className="flex items-center gap-2 pt-2 border-t border-red-200">
+            <span className="text-sm text-red-600">
+              <strong className="font-medium">Transcription model</strong> is
+              needed to make Hyprnote listen to your conversations.
+            </span>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/apps/desktop/src/components/settings/calendar/index.tsx b/apps/desktop/src/components/settings/calendar/index.tsx
index 49d65642f7..09c853fac9 100644
--- a/apps/desktop/src/components/settings/calendar/index.tsx
+++ b/apps/desktop/src/components/settings/calendar/index.tsx
@@ -7,4 +7,3 @@ export function SettingsCalendar() {
     </div>
   );
 }
-
diff --git a/apps/desktop/src/components/settings/calendar/shared.tsx b/apps/desktop/src/components/settings/calendar/shared.tsx
index 1712d107d2..8292d44e9c 100644
--- a/apps/desktop/src/components/settings/calendar/shared.tsx
+++ b/apps/desktop/src/components/settings/calendar/shared.tsx
@@ -42,4 +42,3 @@ const _PROVIDERS = [
 ] as const satisfies readonly CalendarProvider[];
 
 export const PROVIDERS = [..._PROVIDERS];
-
diff --git a/apps/desktop/src/store/tinybase/jsonPersister.ts b/apps/desktop/src/store/tinybase/jsonPersister.ts
index 96abd956bc..417f1ba179 100644
--- a/apps/desktop/src/store/tinybase/jsonPersister.ts
+++ b/apps/desktop/src/store/tinybase/jsonPersister.ts
@@ -177,6 +177,13 @@ export async function migrateKeysJsonToSettings(): Promise<boolean> {
     );
     return true;
   } catch (error) {
+    const errorStr = String(error);
+    if (
+      errorStr.includes("No such file or directory") ||
+      errorStr.includes("ENOENT")
+    ) {
+      return false;
+    }
     console.error("[migrateKeysJsonToSettings] error:", error);
     return false;
   }