diff --git a/echo/frontend/src/features/sidebar/views/workspace/WorkspaceHomeView.tsx b/echo/frontend/src/features/sidebar/views/workspace/WorkspaceHomeView.tsx
index c699ad90..393796c6 100644
--- a/echo/frontend/src/features/sidebar/views/workspace/WorkspaceHomeView.tsx
+++ b/echo/frontend/src/features/sidebar/views/workspace/WorkspaceHomeView.tsx
@@ -2,6 +2,7 @@ import { Trans } from "@lingui/react/macro";
 import { AppWindow, Gear, Plus, PushPin } from "@phosphor-icons/react";
 import { useMemo } from "react";
 import { useParams } from "react-router";
+import { isAdminRole } from "@/lib/roles";
 import { useWorkspace } from "@/hooks/useWorkspace";
 import { useWorkspaceProjects } from "@/hooks/useWorkspaceProjects";
 import { BackButton } from "../../primitives/BackButton";
@@ -29,6 +30,13 @@ export const WorkspaceHomeView = () => {
 	const backLabel = workspace?.org_name ?? "Home";
 	const isExternal = workspace?.role === "external";
 	const canCreateProject = !isExternal;
+	const isAdmin = isAdminRole(workspace?.role);
+	const isBilling = workspace?.role === "billing";
+	const settingsPath = isAdmin
+		? `${base}/settings/general`
+		: isBilling
+			? `${base}/settings/billing`
+			: `${base}/settings/members`;
 
 	return (
 		<nav className="flex h-full flex-col gap-0.5 p-1.5">
@@ -71,7 +79,7 @@ export const WorkspaceHomeView = () => {
 				<>
 					<div className="mt-auto" />
 					<NavItem
-						to={`${base}/settings/general`}
+						to={settingsPath}
 						label={<Trans>Settings</Trans>}
 						icon={Gear}
 						pushes
diff --git a/echo/frontend/src/features/sidebar/views/workspace/WorkspaceSettingsView.tsx b/echo/frontend/src/features/sidebar/views/workspace/WorkspaceSettingsView.tsx
index 11990c22..3068acee 100644
--- a/echo/frontend/src/features/sidebar/views/workspace/WorkspaceSettingsView.tsx
+++ b/echo/frontend/src/features/sidebar/views/workspace/WorkspaceSettingsView.tsx
@@ -1,26 +1,34 @@
 import { Trans } from "@lingui/react/macro";
 import { CreditCard, Gear, Users, Warning } from "@phosphor-icons/react";
 import { useParams } from "react-router";
+import { useWorkspace } from "@/hooks/useWorkspace";
+import { isAdminRole } from "@/lib/roles";
 import { BackButton } from "../../primitives/BackButton";
 import { NavItem } from "../../primitives/NavItem";
 
 export const WorkspaceSettingsView = () => {
 	const { workspaceId } = useParams<{ workspaceId: string }>();
+	const { workspaces } = useWorkspace();
 
 	if (!workspaceId) return null;
 	const base = `/w/${workspaceId}/settings`;
 
+	const workspace = workspaces.find((w) => w.id === workspaceId);
+	const isAdmin = isAdminRole(workspace?.role);
+
 	return (
 		<nav className="flex h-full flex-col gap-0.5 p-1.5">
 			<BackButton
 				to={`/w/${workspaceId}/home`}
 				label={<Trans>Settings</Trans>}
 			/>
-			<NavItem
-				to={`${base}/general`}
-				label={<Trans>General</Trans>}
-				icon={Gear}
-			/>
+			{isAdmin && (
+				<NavItem
+					to={`${base}/general`}
+					label={<Trans>General</Trans>}
+					icon={Gear}
+				/>
+			)}
 			<NavItem
 				to={`${base}/members`}
 				label={<Trans>Members</Trans>}
@@ -31,11 +39,13 @@ export const WorkspaceSettingsView = () => {
 				label={<Trans>Usage and billing</Trans>}
 				icon={CreditCard}
 			/>
-			<NavItem
-				to={`${base}/danger`}
-				label={<Trans>Danger zone</Trans>}
-				icon={Warning}
-			/>
+			{isAdmin && (
+				<NavItem
+					to={`${base}/danger`}
+					label={<Trans>Danger zone</Trans>}
+					icon={Warning}
+				/>
+			)}
 		</nav>
 	);
 };
diff --git a/echo/frontend/src/routes/workspaces/WorkspaceSettingsRoute.tsx b/echo/frontend/src/routes/workspaces/WorkspaceSettingsRoute.tsx
index 1a85eccc..5544f055 100644
--- a/echo/frontend/src/routes/workspaces/WorkspaceSettingsRoute.tsx
+++ b/echo/frontend/src/routes/workspaces/WorkspaceSettingsRoute.tsx
@@ -410,27 +410,47 @@ export const WorkspaceSettingsRoute = () => {
 	// order stable. Default depends on caller role, so until settings
 	// loads we fall back to "general"; once loaded, the effect may fire
 	// a second time with the role-correct default if the URL is bare.
-	const callerCanManage =
-		settings?.my_policies?.includes("member:manage") ?? false;
-	const defaultTab: TabValue =
-		settings?.my_role === "billing" && !callerCanManage ? "billing" : "general";
-	const activeTab: TabValue = segmentIsValid
-		? (segment as TabValue)
-		: defaultTab;
+	const callerCanManage = useMemo(() => {
+		if (!settings) return false;
+		return settings.my_policies?.includes("member:manage") ?? false;
+	}, [settings]);
+
+	const canEditSettings = useMemo(() => {
+		if (!settings) return false;
+		return settings.my_policies?.includes("settings:manage") ?? false;
+	}, [settings]);
+
+	const defaultTab = useMemo<TabValue | null>(() => {
+		if (!settings) return null;
+		return canEditSettings
+			? "general"
+			: settings.my_role === "billing"
+				? "billing"
+				: "members";
+	}, [settings, canEditSettings]);
+
+	const activeTab: TabValue = useMemo(() => {
+		if (segmentIsValid) {
+			return segment as TabValue;
+		}
+		return defaultTab ?? "general";
+	}, [segmentIsValid, segment, defaultTab]);
+
 	const setActiveTab = (value: string | null) => {
 		if (!value || !workspaceId) return;
 		navigate(`/w/${workspaceId}/settings/${value}${urlSearch}`, {
 			replace: true,
 		});
 	};
+
 	useEffect(() => {
-		if (!workspaceId) return;
+		if (!workspaceId || !settings || !defaultTab) return;
 		if (segment !== activeTab) {
 			navigate(`/w/${workspaceId}/settings/${activeTab}${urlSearch}`, {
 				replace: true,
 			});
 		}
-	}, [workspaceId, segment, activeTab, navigate, urlSearch]);
+	}, [workspaceId, segment, activeTab, navigate, urlSearch, settings, defaultTab]);
 
 	// Members list order (2026-04-24): internals first — sorted by role
 	// (owner → admin → billing → member) — then externals at the bottom.
@@ -547,8 +567,6 @@ export const WorkspaceSettingsRoute = () => {
 
 	const canManage = callerCanManage;
 	const myAppUserId = meV2?.id ?? null;
-	const canEditSettings =
-		settings.my_policies?.includes("settings:manage") ?? false;
 	const seesFinancials =
 		settings.my_policies?.includes("workspace:view_invoices") ?? false;