diff --git a/app/components/size-badge-popover.tsx b/app/components/size-badge-popover.tsx
index 593e50a9..0c909422 100644
--- a/app/components/size-badge-popover.tsx
+++ b/app/components/size-badge-popover.tsx
@@ -5,7 +5,7 @@ import {
   SparklesIcon,
 } from 'lucide-react'
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { href, useFetcher, useParams } from 'react-router'
+import { href, useFetcher } from 'react-router'
 import { Badge, Button } from '~/app/components/ui'
 import { Avatar, AvatarFallback, AvatarImage } from '~/app/components/ui/avatar'
 import {
@@ -27,6 +27,7 @@ import {
 import { cn } from '~/app/libs/utils'
 
 interface SizeBadgePopoverProps {
+  orgSlug: string
   complexity: string | null
   complexityReason: string | null
   riskAreas: string | null
@@ -40,6 +41,7 @@ interface SizeBadgePopoverProps {
 }
 
 export function SizeBadgePopover({
+  orgSlug,
   complexity,
   complexityReason,
   riskAreas,
@@ -51,7 +53,6 @@ export function SizeBadgePopover({
   repositoryId,
   number,
 }: SizeBadgePopoverProps) {
-  const { orgSlug } = useParams()
   const fetcher = useFetcher()
   const draftFetcher = useFetcher<{ reason?: string; error?: string }>()
   const [open, setOpen] = useState(false)
@@ -256,7 +257,7 @@ export function SizeBadgePopover({
                 draftFetcher.submit(fd, {
                   method: 'post',
                   action: href('/:orgSlug/draft-feedback-reason', {
-                    orgSlug: orgSlug!,
+                    orgSlug,
                   }),
                 })
               }}
@@ -280,7 +281,7 @@ export function SizeBadgePopover({
                 fetcher.submit(fd, {
                   method: 'post',
                   action: href('/:orgSlug/pr-size-feedback', {
-                    orgSlug: orgSlug!,
+                    orgSlug,
                   }),
                 })
               }}
diff --git a/app/components/ui/pagination.tsx b/app/components/ui/pagination.tsx
index f540a14f..a8f0f71a 100644
--- a/app/components/ui/pagination.tsx
+++ b/app/components/ui/pagination.tsx
@@ -10,7 +10,6 @@ import { cn } from '~/app/libs/utils'
 
 function Pagination({ className, ...props }: React.ComponentProps<'nav'>) {
   return (
-    // biome-ignore lint/a11y/useSemanticElements: shadcn-ui issue
     <nav
       // biome-ignore lint/a11y/noRedundantRoles: shadcn-ui issue
       role="navigation"
diff --git a/app/routes/$orgSlug/settings/data-management/index.tsx b/app/routes/$orgSlug/settings/data-management/index.tsx
index 5bf4c02e..b140947b 100644
--- a/app/routes/$orgSlug/settings/data-management/index.tsx
+++ b/app/routes/$orgSlug/settings/data-management/index.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { data, href, useFetcher, useParams } from 'react-router'
+import { data, href, useFetcher } from 'react-router'
 import { match } from 'ts-pattern'
 import {
   Alert,
@@ -212,12 +212,10 @@ function RecalculateSection() {
 
 // --- Export Data Section ---
 
-function ExportDataSection() {
-  const { orgSlug } = useParams()
+function ExportDataSection({ orgSlug }: { orgSlug: string }) {
   const [includeRaw, setIncludeRaw] = useState(false)
 
   const handleDownload = () => {
-    if (!orgSlug) return
     const params = includeRaw ? '?includeRaw=true' : ''
     window.location.assign(
       href('/:orgSlug/settings/data-management/export-parquet', {
@@ -258,6 +256,7 @@ function ExportDataSection() {
 
 export default function DataManagementPage({
   loaderData: { refreshRequestedAt },
+  params: { orgSlug },
 }: Route.ComponentProps) {
   return (
     <ContentSection
@@ -267,7 +266,7 @@ export default function DataManagementPage({
       <Stack gap="6">
         <RefreshSection refreshRequestedAt={refreshRequestedAt} />
         <RecalculateSection />
-        <ExportDataSection />
+        <ExportDataSection orgSlug={orgSlug} />
       </Stack>
     </ContentSection>
   )
diff --git a/app/routes/$orgSlug/settings/repositories/$repository/delete/index.tsx b/app/routes/$orgSlug/settings/repositories/$repository/delete/index.tsx
index 6600d171..cd73877c 100644
--- a/app/routes/$orgSlug/settings/repositories/$repository/delete/index.tsx
+++ b/app/routes/$orgSlug/settings/repositories/$repository/delete/index.tsx
@@ -36,7 +36,7 @@ export const action = async ({ params, context }: Route.ActionArgs) => {
   await deleteRepository(organization.id, repositoryId)
 
   return redirect(
-    href('/:orgSlug/settings/repositories', { orgSlug: organization.slug! }),
+    href('/:orgSlug/settings/repositories', { orgSlug: organization.slug }),
   )
 }
 
@@ -76,7 +76,7 @@ export default function DeleteRepositoryPage({
           <Button asChild variant="ghost">
             <Link
               to={href('/:orgSlug/settings/repositories', {
-                orgSlug: organization.slug!,
+                orgSlug: organization.slug,
               })}
             >
               Cancel
diff --git a/app/routes/$orgSlug/settings/repositories/$repository/settings/index.tsx b/app/routes/$orgSlug/settings/repositories/$repository/settings/index.tsx
index 385a28b1..92553b28 100644
--- a/app/routes/$orgSlug/settings/repositories/$repository/settings/index.tsx
+++ b/app/routes/$orgSlug/settings/repositories/$repository/settings/index.tsx
@@ -83,7 +83,7 @@ export const action = async ({
   await updateRepository(organization.id, repositoryId, submission.value)
 
   return redirect(
-    href('/:orgSlug/settings/repositories', { orgSlug: organization.slug! }),
+    href('/:orgSlug/settings/repositories', { orgSlug: organization.slug }),
   )
 }
 
@@ -160,7 +160,7 @@ const GithubRepositoryForm = ({
           <Button asChild variant="ghost">
             <Link
               to={href('/:orgSlug/settings/repositories', {
-                orgSlug: organization.slug!,
+                orgSlug: organization.slug,
               })}
             >
               Cancel
diff --git a/app/routes/$orgSlug/throughput/deployed/+columns.tsx b/app/routes/$orgSlug/throughput/deployed/+columns.tsx
index 1fa2fa3a..ef33957c 100644
--- a/app/routes/$orgSlug/throughput/deployed/+columns.tsx
+++ b/app/routes/$orgSlug/throughput/deployed/+columns.tsx
@@ -7,7 +7,10 @@ import dayjs from '~/app/libs/dayjs'
 import { complexitySortingFn } from '~/app/libs/pr-classify'
 import type { PullRequest } from './index'
 
-export function createColumns(timezone: string): ColumnDef<PullRequest>[] {
+export function createColumns(
+  timezone: string,
+  orgSlug: string,
+): ColumnDef<PullRequest>[] {
   return [
     {
       accessorKey: 'author',
@@ -71,6 +74,7 @@ export function createColumns(timezone: string): ColumnDef<PullRequest>[] {
       ),
       cell: ({ row }) => (
         <SizeBadgePopover
+          orgSlug={orgSlug}
           complexity={row.original.complexity}
           complexityReason={row.original.complexityReason}
           riskAreas={row.original.riskAreas}
diff --git a/app/routes/$orgSlug/throughput/deployed/index.tsx b/app/routes/$orgSlug/throughput/deployed/index.tsx
index 779f7948..ae19f6fb 100644
--- a/app/routes/$orgSlug/throughput/deployed/index.tsx
+++ b/app/routes/$orgSlug/throughput/deployed/index.tsx
@@ -105,10 +105,14 @@ export default function DeployedPage({
     teams,
     businessDaysOnly,
   },
+  params: { orgSlug },
 }: Route.ComponentProps) {
   const [, setSearchParams] = useSearchParams()
   const timezone = useTimezone()
-  const columns = useMemo(() => createColumns(timezone), [timezone])
+  const columns = useMemo(
+    () => createColumns(timezone, orgSlug),
+    [timezone, orgSlug],
+  )
 
   return (
     <Stack>
diff --git a/app/routes/$orgSlug/throughput/merged/+columns.tsx b/app/routes/$orgSlug/throughput/merged/+columns.tsx
index e282548a..c00b2d13 100644
--- a/app/routes/$orgSlug/throughput/merged/+columns.tsx
+++ b/app/routes/$orgSlug/throughput/merged/+columns.tsx
@@ -7,7 +7,10 @@ import dayjs from '~/app/libs/dayjs'
 import { complexitySortingFn } from '~/app/libs/pr-classify'
 import type { PullRequest } from './index'
 
-export function createColumns(timezone: string): ColumnDef<PullRequest>[] {
+export function createColumns(
+  timezone: string,
+  orgSlug: string,
+): ColumnDef<PullRequest>[] {
   return [
     {
       accessorKey: 'author',
@@ -71,6 +74,7 @@ export function createColumns(timezone: string): ColumnDef<PullRequest>[] {
       ),
       cell: ({ row }) => (
         <SizeBadgePopover
+          orgSlug={orgSlug}
           complexity={row.original.complexity}
           complexityReason={row.original.complexityReason}
           riskAreas={row.original.riskAreas}
diff --git a/app/routes/$orgSlug/throughput/merged/index.tsx b/app/routes/$orgSlug/throughput/merged/index.tsx
index 1ee7a1d3..62410eaa 100644
--- a/app/routes/$orgSlug/throughput/merged/index.tsx
+++ b/app/routes/$orgSlug/throughput/merged/index.tsx
@@ -105,10 +105,14 @@ export default function OrganizationIndex({
     teams,
     businessDaysOnly,
   },
+  params: { orgSlug },
 }: Route.ComponentProps) {
   const [, setSearchParams] = useSearchParams()
   const timezone = useTimezone()
-  const columns = useMemo(() => createColumns(timezone), [timezone])
+  const columns = useMemo(
+    () => createColumns(timezone, orgSlug),
+    [timezone, orgSlug],
+  )
 
   return (
     <Stack>
diff --git a/app/routes/$orgSlug/throughput/ongoing/+columns.tsx b/app/routes/$orgSlug/throughput/ongoing/+columns.tsx
index 1670bcae..2031c092 100644
--- a/app/routes/$orgSlug/throughput/ongoing/+columns.tsx
+++ b/app/routes/$orgSlug/throughput/ongoing/+columns.tsx
@@ -6,7 +6,10 @@ import dayjs from '~/app/libs/dayjs'
 import { complexitySortingFn } from '~/app/libs/pr-classify'
 import type { PullRequest } from './index'
 
-export function createColumns(timezone: string): ColumnDef<PullRequest>[] {
+export function createColumns(
+  timezone: string,
+  orgSlug: string,
+): ColumnDef<PullRequest>[] {
   return [
     {
       accessorKey: 'author',
@@ -70,6 +73,7 @@ export function createColumns(timezone: string): ColumnDef<PullRequest>[] {
       ),
       cell: ({ row }) => (
         <SizeBadgePopover
+          orgSlug={orgSlug}
           complexity={row.original.complexity}
           complexityReason={row.original.complexityReason}
           riskAreas={row.original.riskAreas}
diff --git a/app/routes/$orgSlug/throughput/ongoing/index.tsx b/app/routes/$orgSlug/throughput/ongoing/index.tsx
index a3a2bcec..62ec262d 100644
--- a/app/routes/$orgSlug/throughput/ongoing/index.tsx
+++ b/app/routes/$orgSlug/throughput/ongoing/index.tsx
@@ -61,10 +61,14 @@ export const loader = async ({ request, context }: Route.LoaderArgs) => {
 
 export default function OngoingPage({
   loaderData: { pullRequests, median, teams, businessDaysOnly },
+  params: { orgSlug },
 }: Route.ComponentProps) {
   const [, setSearchParams] = useSearchParams()
   const timezone = useTimezone()
-  const columns = useMemo(() => createColumns(timezone), [timezone])
+  const columns = useMemo(
+    () => createColumns(timezone, orgSlug),
+    [timezone, orgSlug],
+  )
 
   return (
     <Stack>
diff --git a/app/routes/$orgSlug/workload/+components/team-stacks-chart.tsx b/app/routes/$orgSlug/workload/+components/team-stacks-chart.tsx
index 78e7ee87..256e29f9 100644
--- a/app/routes/$orgSlug/workload/+components/team-stacks-chart.tsx
+++ b/app/routes/$orgSlug/workload/+components/team-stacks-chart.tsx
@@ -119,8 +119,9 @@ function MemberLink({
   login: string
   displayName: string
 }) {
-  const { orgSlug = '' } = useParams()
+  const { orgSlug } = useParams()
   const [searchParams] = useSearchParams()
+  if (!orgSlug) throw new Error('MemberLink requires orgSlug param')
   const query = searchParams.toString()
   const basePath = href('/:orgSlug/workload/:login', { orgSlug, login })
   const linkTo = query ? `${basePath}?${query}` : basePath
diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
index 213a26ae..bb574176 100644
--- a/app/routes/_index.tsx
+++ b/app/routes/_index.tsx
@@ -10,7 +10,7 @@ export const loader = async ({ request }: Route.LoaderArgs) => {
 
   const firstOrg = await getFirstOrganization(session.user.id)
   if (firstOrg) {
-    throw redirect(href('/:orgSlug', { orgSlug: firstOrg.slug! }))
+    throw redirect(href('/:orgSlug', { orgSlug: firstOrg.slug }))
   }
 
   throw redirect('/no-org')
diff --git a/app/routes/admin/_index/index.tsx b/app/routes/admin/_index/index.tsx
index 7d4fc297..5bc05d53 100644
--- a/app/routes/admin/_index/index.tsx
+++ b/app/routes/admin/_index/index.tsx
@@ -48,7 +48,7 @@ const AdminOrganizationIndex = ({
                     <Button asChild size="sm" variant="link">
                       <Link
                         to={href('/:orgSlug/settings', {
-                          orgSlug: organization.slug!,
+                          orgSlug: organization.slug,
                         })}
                       >
                         Settings
diff --git a/app/routes/resources/organization.tsx b/app/routes/resources/organization.tsx
index e550aad5..2c7acf19 100644
--- a/app/routes/resources/organization.tsx
+++ b/app/routes/resources/organization.tsx
@@ -63,7 +63,7 @@ export const OrganizationSwitcher = ({
         {fetcher.data?.organizations.map((organization) => (
           <DropdownMenuGroup key={organization.id}>
             <DropdownMenuItem asChild>
-              <Link to={href('/:orgSlug', { orgSlug: organization.slug! })}>
+              <Link to={href('/:orgSlug', { orgSlug: organization.slug })}>
                 {organization.name}
               </Link>
             </DropdownMenuItem>
diff --git a/biome.json b/biome.json
index ea5ad2dd..5783ea10 100644
--- a/biome.json
+++ b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.13/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.7/schema.json",
   "assist": { "actions": { "source": { "organizeImports": "off" } } },
   "files": {
     "includes": [