diff --git a/apps/nextjs/src/components/layout/header/query-refresh-indicator.tsx b/apps/nextjs/src/components/layout/header/query-refresh-indicator.tsx
index 932005267..6ac2e7f1e 100644
--- a/apps/nextjs/src/components/layout/header/query-refresh-indicator.tsx
+++ b/apps/nextjs/src/components/layout/header/query-refresh-indicator.tsx
@@ -41,9 +41,7 @@ const parseWidgetQueryKey = (queryKey: readonly unknown[]): { procedure: string;
   const procedure = first.slice(1).map(capitalize).join(" — ");
 
   const second = queryKey[1] as { input?: Record<string, unknown> } | undefined;
-  const integrationIds = Array.isArray(second?.input?.integrationIds)
-    ? (second.input.integrationIds as string[])
-    : [];
+  const integrationIds = Array.isArray(second?.input?.integrationIds) ? (second.input.integrationIds as string[]) : [];
 
   return { procedure, integrationIds };
 };
diff --git a/packages/boards/src/context.tsx b/packages/boards/src/context.tsx
index 24642b58d..c2ccc690a 100644
--- a/packages/boards/src/context.tsx
+++ b/packages/boards/src/context.tsx
@@ -86,7 +86,7 @@ export const getCurrentLayout = (board: RouterOutputs["board"]["getBoardByName"]
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   if (typeof window === "undefined") return board.layouts.at(0)!.id;
 
-  const sortedLayouts = board.layouts.sort((layoutA, layoutB) => layoutB.breakpoint - layoutA.breakpoint);
+  const sortedLayouts = board.layouts.toSorted((layoutA, layoutB) => layoutB.breakpoint - layoutA.breakpoint);
 
   // Fallback to smallest if none exists with breakpoint smaller than window width
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion