diff --git a/frappe-ui-react b/frappe-ui-react
index 285675696..5e655f9d7 160000
--- a/frappe-ui-react
+++ b/frappe-ui-react
@@ -1 +1 @@
-Subproject commit 2856756967c7bbba18bbb1c247b06d1797e45b95
+Subproject commit 5e655f9d7131d549d53aa5d4b2949fecaed460c9
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/context.ts b/frontend/packages/app/src/pages/project-details/tabs/risks/context.ts
index d7233cbf7..29f1ebe02 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/context.ts
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/context.ts
@@ -7,7 +7,13 @@ import { createContext, useContextSelector } from "use-context-selector";
  * Internal dependencies.
  */
 import { RISK_STATUSES, type RiskStatus } from "./constants";
-import type { RiskFilters, RiskItem, RiskVisibleColumns } from "./types";
+import type {
+  RiskFilters,
+  RiskItem,
+  RiskSort,
+  RiskVisibleColumns,
+  UserDetails,
+} from "./types";
 
 export interface RisksContextProps {
   state: {
@@ -16,14 +22,17 @@ export interface RisksContextProps {
     error: unknown;
     filters: RiskFilters;
     visibleColumns: RiskVisibleColumns;
+    sort: RiskSort | null;
     isCreateRiskOpen: boolean;
     editRiskName: string | null;
     createRiskInitialStatus: RiskStatus | "";
     deleteRiskName: string | null;
+    allOwnersWithDetails: Record<string, UserDetails | undefined>;
   };
   actions: {
     setFilters: (filters: Partial<RiskFilters>) => void;
     setVisibleColumns: (cols: Partial<RiskVisibleColumns>) => void;
+    setSort: (sort: RiskSort | null) => void;
     updateRiskStatus: (name: string, status: RiskStatus) => Promise<void>;
     openCreateRisk: () => void;
     closeCreateRisk: () => void;
@@ -54,14 +63,17 @@ export const RisksContext = createContext<RisksContextProps>({
       advanced: [],
     },
     visibleColumns: defaultVisibleColumns,
+    sort: null,
     isCreateRiskOpen: false,
     editRiskName: null,
     createRiskInitialStatus: "",
     deleteRiskName: null,
+    allOwnersWithDetails: {},
   },
   actions: {
     setFilters: noop,
     setVisibleColumns: noop,
+    setSort: noop,
     updateRiskStatus: async () => {},
     openCreateRisk: noop,
     closeCreateRisk: noop,
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/header.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/header.tsx
index 11ee4880a..d8af5a12a 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/header.tsx
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/header.tsx
@@ -8,19 +8,24 @@ import { Plus } from "lucide-react";
  * Internal dependencies.
  */
 import { useRisks } from "./context";
+import { RisksToolbar } from "./toolbar/toolbar";
 
 export function RisksHeader() {
   const openCreateRisk = useRisks((c) => c.actions.openCreateRisk);
 
   return (
-    <div className="flex items-center justify-between mb-3.5">
-      <h1 className="text-xl font-semibold text-ink-gray-8">Risks</h1>
-      <Button
-        variant="solid"
-        label="Create"
-        iconLeft={() => <Plus />}
-        onClick={openCreateRisk}
-      />
-    </div>
+    <>
+      <div className="flex items-center justify-between mb-3.5">
+        <h1 className="text-xl font-semibold text-ink-gray-8">Risks</h1>
+        <Button
+          variant="solid"
+          label="Create"
+          iconLeft={() => <Plus />}
+          onClick={openCreateRisk}
+        />
+      </div>
+
+      <RisksToolbar />
+    </>
   );
 }
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/index.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/index.tsx
index 7f891328c..04991c4d1 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/index.tsx
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/index.tsx
@@ -2,6 +2,8 @@
  * External dependencies.
  */
 import { useSearchParams } from "react-router-dom";
+import { mergeClassNames as cn } from "@next-pms/design-system";
+import { Spinner } from "@next-pms/design-system/components";
 
 /**
  * Internal dependencies.
@@ -31,6 +33,7 @@ function RisksContent() {
   const deleteRiskName = useRisks((c) => c.state.deleteRiskName);
   const closeCreateRisk = useRisks((c) => c.actions.closeCreateRisk);
   const closeDeleteRisk = useRisks((c) => c.actions.closeDeleteRisk);
+  const isLoading = useRisks((c) => c.state.isLoading);
 
   return (
     <>
@@ -46,9 +49,21 @@ function RisksContent() {
       {riskId ? (
         <RiskDetailView riskId={riskId} />
       ) : (
-        <div className="flex flex-col h-full">
+        <div className="relative flex flex-col h-full">
           <RisksHeader />
-          {activeView === "kanban" ? <RisksKanbanView /> : <RisksListView />}
+          <div
+            className={cn("flex flex-col flex-1 min-h-0", {
+              "opacity-50 transition-opacity duration-150": isLoading,
+            })}
+          >
+            {activeView === "kanban" ? <RisksKanbanView /> : <RisksListView />}
+          </div>
+          {isLoading && (
+            <Spinner
+              isFull
+              className="absolute top-0 left-0 w-full h-full cursor-wait"
+            />
+          )}
         </div>
       )}
     </>
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/kanban/kanbanView.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/kanban/kanbanView.tsx
index 18bfb8a01..89fb4d02b 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/kanban/kanbanView.tsx
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/kanban/kanbanView.tsx
@@ -34,33 +34,27 @@ export function RisksKanbanView() {
     (c) => c.actions.openCreateRiskWithStatus,
   );
   const toast = useToasts();
+  const [localData, setLocalData] = useState<RiskItem[]>(data);
+
+  useEffect(() => {
+    if (!data || data.length === 0) return;
+    setLocalData(data);
+  }, [data]);
 
   const [items, setItems] = useState<RiskIdsByStatus>(emptyGroups);
 
   const byId = useMemo(() => {
     const map = new Map<string, RiskItem>();
-    for (const risk of data) {
+    for (const risk of localData) {
       map.set(risk.name, risk);
     }
     return map;
-  }, [data]);
+  }, [localData]);
 
   useEffect(() => {
-    setItems((current) => {
-      const fromServer = groupIdsByStatus(data);
-      const merged = {} as RiskIdsByStatus;
-      for (const status of RISK_STATUSES) {
-        const serverSet = new Set(fromServer[status]);
-        // Preserve existing drag-and-drop order; drop items that moved away
-        const kept = current[status].filter((id) => serverSet.has(id));
-        const keptSet = new Set(kept);
-        // Append any items newly added on the server side
-        const added = fromServer[status].filter((id) => !keptSet.has(id));
-        merged[status as RiskStatus] = [...kept, ...added];
-      }
-      return merged;
-    });
-  }, [data]);
+    if (!localData) return;
+    setItems(groupIdsByStatus(localData));
+  }, [localData]);
 
   return (
     <DragDropProvider<RiskDragData, RiskDraggable, RiskDroppable>
@@ -84,7 +78,7 @@ export function RisksKanbanView() {
         try {
           await updateRiskStatus(riskId, newStatus);
         } catch {
-          setItems(groupIdsByStatus(data));
+          setItems(groupIdsByStatus(localData));
           const risk = byId.get(riskId);
           toast.error(
             `Error updating status for ${risk?.risk_category ?? riskId}`,
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/list/listView.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/list/listView.tsx
index 177b79307..31bbc1f57 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/list/listView.tsx
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/list/listView.tsx
@@ -1,6 +1,7 @@
 /**
  * External dependencies.
  */
+import { useEffect, useState } from "react";
 import { Accordion } from "@base-ui/react/accordion";
 
 /**
@@ -9,12 +10,21 @@ import { Accordion } from "@base-ui/react/accordion";
 import { RISK_LIST_COLUMNS } from "../constants";
 import { useRisks } from "../context";
 import { RiskGroup } from "./listViewGroup";
+import { RiskItem } from "../types";
 
 export function RisksListView() {
   const data = useRisks((c) => c.state.data);
+  const [localData, setLocalData] = useState<RiskItem[]>(data);
 
-  const openRisks = data.filter((r) => !r.status || r.status !== "Mitigated");
-  const mitigatedRisks = data.filter((r) => r.status === "Mitigated");
+  useEffect(() => {
+    if (!data || data.length === 0) return;
+    setLocalData(data);
+  }, [data]);
+
+  const openRisks = localData.filter(
+    (r) => !r.status || r.status !== "Mitigated",
+  );
+  const mitigatedRisks = localData.filter((r) => r.status === "Mitigated");
 
   return (
     <div className="flex flex-col">
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/provider.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/provider.tsx
index 0f47b7ae8..3a4396448 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/provider.tsx
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/provider.tsx
@@ -10,7 +10,7 @@ import { useFrappeUpdateDoc } from "frappe-react-sdk";
  */
 import { RISK_DETAIL_PARAM, RISK_STATUSES, type RiskStatus } from "./constants";
 import { RisksContext, type RisksContextProps } from "./context";
-import type { RiskFilters, RiskVisibleColumns } from "./types";
+import type { RiskFilters, RiskSort, RiskVisibleColumns } from "./types";
 import { useRisksData } from "./useRisksData";
 
 const defaultFilters: RiskFilters = {
@@ -35,9 +35,16 @@ export function RisksProvider({ children }: PropsWithChildren) {
     RiskStatus | ""
   >("");
   const [deleteRiskName, setDeleteRiskName] = useState<string | null>(null);
+  const [sort, setSortState] = useState<RiskSort | null>(null);
   const [, setSearchParams] = useSearchParams();
 
-  const { data, isLoading, error, mutate: refreshRiskList } = useRisksData();
+  const {
+    data,
+    isLoading,
+    error,
+    mutate: refreshRiskList,
+    allOwnersWithDetails,
+  } = useRisksData(filters, sort);
 
   const { updateDoc } = useFrappeUpdateDoc();
 
@@ -52,6 +59,11 @@ export function RisksProvider({ children }: PropsWithChildren) {
     [],
   );
 
+  const setSort = useCallback((s: RiskSort | null) => {
+    setSortState(s);
+    void refreshRiskList();
+  }, []);
+
   const updateRiskStatus = useCallback(
     async (name: string, status: RiskStatus) => {
       await updateDoc("Risk", name, { status });
@@ -114,14 +126,17 @@ export function RisksProvider({ children }: PropsWithChildren) {
         error,
         filters,
         visibleColumns,
+        sort,
         isCreateRiskOpen,
         editRiskName,
         createRiskInitialStatus,
         deleteRiskName,
+        allOwnersWithDetails,
       },
       actions: {
         setFilters,
         setVisibleColumns,
+        setSort,
         updateRiskStatus,
         openCreateRisk,
         closeCreateRisk,
@@ -139,12 +154,15 @@ export function RisksProvider({ children }: PropsWithChildren) {
       error,
       filters,
       visibleColumns,
+      sort,
       isCreateRiskOpen,
       editRiskName,
       createRiskInitialStatus,
       deleteRiskName,
+      allOwnersWithDetails,
       setFilters,
       setVisibleColumns,
+      setSort,
       updateRiskStatus,
       openCreateRisk,
       closeCreateRisk,
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/columnsDropdown.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/columnsDropdown.tsx
new file mode 100644
index 000000000..f002b751a
--- /dev/null
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/columnsDropdown.tsx
@@ -0,0 +1,60 @@
+/**
+ * External dependencies.
+ */
+import { useMemo } from "react";
+import { MultiSelect } from "@rtcamp/frappe-ui-react";
+import type { MultiSelectOption } from "@rtcamp/frappe-ui-react";
+
+/**
+ * Internal dependencies.
+ */
+import { RISK_STATUSES } from "../constants";
+import type { RiskStatus } from "../constants";
+import { RiskStatusBadge } from "../riskStatusBadge";
+import type { RiskVisibleColumns } from "../types";
+
+interface ColumnsDropdownProps {
+  visibleColumns: RiskVisibleColumns;
+  setVisibleColumns: (partial: Partial<RiskVisibleColumns>) => void;
+}
+
+const COLUMN_OPTIONS: MultiSelectOption[] = RISK_STATUSES.map((status) => ({
+  value: status,
+  label: status,
+}));
+
+export function ColumnsDropdown({
+  visibleColumns,
+  setVisibleColumns,
+}: ColumnsDropdownProps) {
+  const selectedValues = useMemo(
+    () =>
+      RISK_STATUSES.filter((status) => visibleColumns[status]).map(
+        (status) => status,
+      ),
+    [visibleColumns],
+  );
+
+  const handleChange = (newValues: string[]) => {
+    const partial = Object.fromEntries(
+      RISK_STATUSES.map((status) => [status, newValues.includes(status)]),
+    ) as unknown as RiskVisibleColumns;
+    setVisibleColumns(partial);
+  };
+
+  return (
+    <div>
+      <MultiSelect
+        options={COLUMN_OPTIONS}
+        value={selectedValues}
+        triggerLabel="Columns"
+        hideSearch
+        onChange={handleChange}
+        renderOption={(option) => (
+          <RiskStatusBadge status={option.value as RiskStatus} />
+        )}
+        popupClassName="w-full"
+      />
+    </div>
+  );
+}
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/sortButton.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/sortButton.tsx
new file mode 100644
index 000000000..9ba017d36
--- /dev/null
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/sortButton.tsx
@@ -0,0 +1,101 @@
+/**
+ * External dependencies.
+ */
+import { useState } from "react";
+import { useSearchParams } from "react-router-dom";
+import { Popover } from "@base-ui/react";
+import { ArrowDown, ArrowUp } from "@rtcamp/frappe-ui-react/icons";
+import { ArrowUpDown } from "lucide-react";
+
+/**
+ * Internal dependencies.
+ */
+import { RISK_VIEW_PARAM } from "../constants";
+import { useRisks } from "../context";
+
+const SORT_FIELDS: { field: string; label: string }[] = [
+  { field: "modified", label: "Last updated on" },
+  { field: "status", label: "Status" },
+  { field: "risk_category", label: "Risk category" },
+  { field: "risk_level", label: "Risk level" },
+];
+
+export function SortButton() {
+  const [open, setOpen] = useState(false);
+  const [searchParams] = useSearchParams();
+  const isKanban = searchParams.get(RISK_VIEW_PARAM) === "kanban";
+  const sort = useRisks((c) => c.state.sort);
+  const setSort = useRisks((c) => c.actions.setSort);
+
+  const sortFields = isKanban
+    ? SORT_FIELDS.filter((f) => f.field !== "status")
+    : SORT_FIELDS;
+
+  const handleFieldClick = (field: string) => {
+    if (sort?.field === field) {
+      setSort({ field, order: sort.order === "asc" ? "desc" : "asc" });
+    } else {
+      setSort({ field, order: "desc" });
+    }
+  };
+
+  const isActive = sort !== null;
+
+  return (
+    <Popover.Root open={open} onOpenChange={setOpen}>
+      <Popover.Trigger
+        className={
+          "flex items-center gap-1.5 rounded px-2 py-1.5 text-sm border cursor-pointer border-none bg-surface-gray-2"
+        }
+      >
+        <ArrowUpDown className="size-3.5" />
+        Sort
+        {isActive && (
+          <span className="text-xs text-ink-gray-5">
+            {sortFields.find((f) => f.field === sort.field)?.label}
+          </span>
+        )}
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Positioner side="bottom" align="end" sideOffset={4}>
+          <Popover.Popup className="min-w-44 rounded-lg border border-outline-gray-2 bg-surface-white shadow-lg py-1 z-50">
+            {sortFields.map(({ field, label }) => {
+              const isSelected = sort?.field === field;
+              return (
+                <button
+                  key={field}
+                  type="button"
+                  className="flex w-full items-center justify-between gap-3 px-3 py-1.5 text-sm text-ink-gray-8 hover:bg-surface-gray-2"
+                  onClick={() => handleFieldClick(field)}
+                >
+                  <span>{label}</span>
+                  {isSelected &&
+                    (sort.order === "asc" ? (
+                      <ArrowUp className="size-4" />
+                    ) : (
+                      <ArrowDown className="size-4" />
+                    ))}
+                </button>
+              );
+            })}
+            {isActive && (
+              <>
+                <div className="my-1 border-t border-outline-gray-2" />
+                <button
+                  type="button"
+                  className="flex w-full items-center px-3 py-1.5 text-sm text-ink-red-3 hover:bg-surface-gray-2"
+                  onClick={() => {
+                    setSort(null);
+                    setOpen(false);
+                  }}
+                >
+                  Clear sort
+                </button>
+              </>
+            )}
+          </Popover.Popup>
+        </Popover.Positioner>
+      </Popover.Portal>
+    </Popover.Root>
+  );
+}
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/toolbar.tsx b/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/toolbar.tsx
new file mode 100644
index 000000000..29ef7e969
--- /dev/null
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/toolbar/toolbar.tsx
@@ -0,0 +1,101 @@
+/**
+ * External dependencies.
+ */
+import { useMemo } from "react";
+import { useSearchParams } from "react-router-dom";
+import { Filter, Select } from "@rtcamp/frappe-ui-react";
+
+/**
+ * Internal dependencies.
+ */
+import { RISK_STATUSES, RISK_VIEW_PARAM } from "../constants";
+import type { RiskStatus } from "../constants";
+import { useRisks } from "../context";
+import { ColumnsDropdown } from "./columnsDropdown";
+import { SortButton } from "./sortButton";
+
+const RISK_LEVEL_OPTIONS = [
+  { label: "All", value: "" },
+  { label: "Low", value: "Low" },
+  { label: "Medium", value: "Medium" },
+  { label: "High", value: "High" },
+];
+
+const STATUS_OPTIONS = [
+  { label: "All", value: "" },
+  ...RISK_STATUSES.map((s) => ({ label: s, value: s })),
+];
+
+export function RisksToolbar() {
+  const [searchParams] = useSearchParams();
+  const isKanban = searchParams.get(RISK_VIEW_PARAM) === "kanban";
+
+  const filters = useRisks((c) => c.state.filters);
+  const allOwnersWithDetails = useRisks((c) => c.state.allOwnersWithDetails);
+  const visibleColumns = useRisks((c) => c.state.visibleColumns);
+  const setFilters = useRisks((c) => c.actions.setFilters);
+  const setVisibleColumns = useRisks((c) => c.actions.setVisibleColumns);
+
+  const ownerOptions = useMemo(() => {
+    return [
+      { label: "All owners", value: "" },
+      ...Object.entries(allOwnersWithDetails).map(([email, details]) => ({
+        label: details?.full_name ?? email,
+        value: email,
+      })),
+    ];
+  }, [allOwnersWithDetails]);
+
+  return (
+    <div className="flex flex-wrap items-center justify-between gap-2 mb-3.5">
+      {/* Left: quick filters */}
+      <div className="flex flex-wrap gap-2">
+        <Select
+          size="sm"
+          placeholder="Owner"
+          className="w-fit"
+          value={filters.owner}
+          onChange={(v) => setFilters({ owner: (v ?? "") as string })}
+          options={ownerOptions}
+        />
+        <Select
+          size="sm"
+          placeholder="Status"
+          className="w-fit"
+          value={filters.status}
+          onChange={(v) => setFilters({ status: (v ?? "") as RiskStatus | "" })}
+          options={STATUS_OPTIONS}
+        />
+        <Select
+          size="sm"
+          placeholder="Risk level"
+          className="w-fit"
+          value={filters.riskLevel}
+          onChange={(v) => setFilters({ riskLevel: (v ?? "") as string })}
+          options={RISK_LEVEL_OPTIONS}
+        />
+      </div>
+
+      {/* Right: columns, filter, sort */}
+      <div className="flex gap-2">
+        {isKanban && (
+          <ColumnsDropdown
+            visibleColumns={visibleColumns}
+            setVisibleColumns={setVisibleColumns}
+          />
+        )}
+        <Filter
+          align="end"
+          value={filters.advanced}
+          onChange={(v) => setFilters({ advanced: v })}
+          fields={[
+            { name: "risk_category", label: "Risk category", type: "string" },
+            { name: "summary", label: "Summary", type: "string" },
+            { name: "owner", label: "Owner", type: "string" },
+          ]}
+        />
+        <SortButton />
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/types.ts b/frontend/packages/app/src/pages/project-details/tabs/risks/types.ts
index 28bdc9681..24c520fae 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/types.ts
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/types.ts
@@ -76,3 +76,8 @@ export interface RiskVisibleColumns {
   Blocked: boolean;
   Mitigated: boolean;
 }
+
+export interface RiskSort {
+  field: string;
+  order: "asc" | "desc";
+}
diff --git a/frontend/packages/app/src/pages/project-details/tabs/risks/useRisksData.ts b/frontend/packages/app/src/pages/project-details/tabs/risks/useRisksData.ts
index f60b92f00..d56d557bf 100644
--- a/frontend/packages/app/src/pages/project-details/tabs/risks/useRisksData.ts
+++ b/frontend/packages/app/src/pages/project-details/tabs/risks/useRisksData.ts
@@ -7,18 +7,55 @@ import { useFrappeGetDocList } from "frappe-react-sdk";
 /**
  * Internal dependencies.
  */
-import { hashString } from "@/lib/utils";
+import {
+  hashString,
+  isCompleteFilterCondition,
+  isNoValueOperator,
+} from "@/lib/utils";
 import { useProjectDetail } from "@/pages/project-details/context";
-import type { RiskItem, UserDetails } from "./types";
+import type { RiskFilters, RiskItem, RiskSort, UserDetails } from "./types";
 
-export function useRisksData() {
+export function useRisksData(filters: RiskFilters, sort: RiskSort | null) {
   const projectId = useProjectDetail((s) => s.projectId);
 
   const frappeFilters = useMemo(() => {
     const base: unknown[] = [["project", "=", projectId]];
-    // TODO: Add more filters
+
+    if (filters.owner) base.push(["owner", "=", filters.owner]);
+    if (filters.status) base.push(["status", "=", filters.status]);
+    if (filters.riskLevel) base.push(["risk_level", "=", filters.riskLevel]);
+
+    for (const f of filters.advanced) {
+      if (!isCompleteFilterCondition(f)) continue;
+      base.push([
+        f.field,
+        f.operator,
+        isNoValueOperator(f.operator) ? null : f.value,
+      ]);
+    }
+
     return base;
-  }, [projectId]);
+  }, [
+    projectId,
+    filters.owner,
+    filters.status,
+    filters.riskLevel,
+    filters.advanced,
+  ]);
+
+  const orderBy = useMemo(
+    () =>
+      sort
+        ? { field: sort.field as keyof RiskItem, order: sort.order }
+        : { field: "modified" as keyof RiskItem, order: "desc" as const },
+    [sort],
+  );
+
+  // We are explicitly not including the sort in the key because including it causes data to be cached separately for each sort option, which then when we move an item from one category to another in kanban view and call mutate to refresh the list, it doesn't update the other cached sort options, causing stale data to be shown when user switches sort or view.
+  const risksSwrKey = useMemo(
+    () => `risks-list-${hashString(JSON.stringify(frappeFilters))}`,
+    [frappeFilters],
+  );
 
   const { data, isLoading, error, mutate } = useFrappeGetDocList<RiskItem>(
     "Risk",
@@ -33,45 +70,66 @@ export function useRisksData() {
         "owner",
       ],
       filters: frappeFilters as never,
+      orderBy,
       limit: 500,
     },
+    risksSwrKey,
   );
 
-  const ownerEmails = useMemo(() => {
-    if (!data?.length) return [];
-    const emails = data.map((r) => r.owner).filter(Boolean) as string[];
+  const { data: allOwnersData } = useFrappeGetDocList<{ owner: string }>(
+    "Risk",
+    {
+      fields: ["owner"],
+      filters: [["project", "=", projectId]] as never,
+      limit: 500,
+    },
+  );
+
+  const allOwners = useMemo(() => {
+    if (!allOwnersData?.length) return [];
+    const emails = allOwnersData
+      .map((r) => r.owner)
+      .filter(Boolean) as string[];
     return [...new Set(emails)];
-  }, [data]);
+  }, [allOwnersData]);
 
   // Build a stable SWR key so the user list re-fetches only when the set of owners changes.
   // Pass null when there are no owners to skip the request entirely.
   const usersSwrKey = useMemo(() => {
-    if (!ownerEmails.length) return null;
-    return `risks-users-${hashString(ownerEmails.slice().sort().join(","))}`;
-  }, [ownerEmails]);
+    if (!allOwners.length) return null;
+    return `risks-users-${hashString(allOwners.slice().sort().join(","))}`;
+  }, [allOwners]);
 
   const { data: usersData } = useFrappeGetDocList<UserDetails>(
     "User",
     {
       fields: ["name", "full_name", "user_image"],
-      filters: ownerEmails.length
-        ? ([["name", "in", ownerEmails]] as never)
-        : ([] as never),
-      limit: ownerEmails.length || 1,
+      filters: allOwners.length ? [["name", "in", allOwners]] : [],
+      limit: allOwners.length || 1,
     },
     usersSwrKey,
   );
 
+  const userMap = useMemo(
+    () => Object.fromEntries((usersData ?? []).map((u) => [u.name, u])),
+    [usersData],
+  );
+
   const enrichedData = useMemo(() => {
     if (!data?.length) return [];
-    const userMap = Object.fromEntries(
-      (usersData ?? []).map((u) => [u.name, u]),
-    );
     return data.map((risk) => ({
       ...risk,
       owner_details: userMap[risk.owner],
     }));
-  }, [data, usersData]);
+  }, [data, userMap]);
+
+  const allOwnersWithDetails = useMemo(
+    () =>
+      Object.fromEntries(
+        allOwners.map((email) => [email, userMap[email]]),
+      ) as Record<string, UserDetails | undefined>,
+    [allOwners, userMap],
+  );
 
-  return { data: enrichedData, isLoading, error, mutate };
+  return { data: enrichedData, isLoading, error, mutate, allOwnersWithDetails };
 }