diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 73a2b5c68fcfc1e19efbab425dd05c804a26c4ee..e628f6ea6a9ab4f01e0599f57991698cc0619be1 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -1105,10 +1105,9 @@ export default function ChatView({ threadId }: ChatViewProps) {
   const keybindings = serverConfigQuery.data?.keybindings ?? EMPTY_KEYBINDINGS;
   const availableEditors = serverConfigQuery.data?.availableEditors ?? EMPTY_AVAILABLE_EDITORS;
   const providerStatuses = serverConfigQuery.data?.providers ?? EMPTY_PROVIDER_STATUSES;
-  const activeProvider = activeThread?.session?.provider ?? "codex";
   const activeProviderStatus = useMemo(
-    () => providerStatuses.find((status) => status.provider === activeProvider) ?? null,
-    [activeProvider, providerStatuses],
+    () => providerStatuses.find((status) => status.provider === selectedProvider) ?? null,
+    [selectedProvider, providerStatuses],
   );
   const activeProjectCwd = activeProject?.cwd ?? null;
   const activeThreadWorktreePath = activeThread?.worktreePath ?? null;
diff --git a/apps/web/src/components/chat/ProviderHealthBanner.tsx b/apps/web/src/components/chat/ProviderHealthBanner.tsx
index 9da45ba3fff55dc3c8800666ee60f3a688641484..73cb77eae9b1934e9b0f54d95643c6257584f39f 100644
--- a/apps/web/src/components/chat/ProviderHealthBanner.tsx
+++ b/apps/web/src/components/chat/ProviderHealthBanner.tsx
@@ -22,7 +22,7 @@ export const ProviderHealthBanner = memo(function ProviderHealthBanner({
     status.status === "error"
       ? `${providerLabel} provider is unavailable.`
       : `${providerLabel} provider has limited availability.`;
-  const title = providerLabel === "Codex" ? "Codex provider status" : `${providerLabel} status`;
+  const title = `${providerLabel} provider status`;
 
   return (
     <div className="pt-3 mx-auto max-w-3xl">