diff --git a/apps/docs/docs/management/api/index.mdx b/apps/docs/docs/management/api/index.mdx
index 451586e1a..fda610981 100644
--- a/apps/docs/docs/management/api/index.mdx
+++ b/apps/docs/docs/management/api/index.mdx
@@ -81,8 +81,8 @@ The OpenAPI and MCP APIs include board management endpoints for common automatio
 - Update board visual and behavior settings
 - Set desktop and mobile home boards for the current user
 - Configure global board defaults such as public home boards, automatic mobile layout mode, and status behavior
+- Configure saved responsive layouts through Homarr's board settings UI when a server uses legacy mobile layout mode
 
 Use the interactive API reference to inspect the exact request body for OpenAPI endpoints under the `boards` and
 `settings` tags. Saved responsive layouts are intentionally not exposed as an OpenAPI or MCP replacement operation
-because omitting a layout would remove it; configure them through Homarr's board settings UI when a server uses
-legacy mobile layout mode.
+because omitting a layout would remove it.
diff --git a/apps/docs/docs/management/boards/index.mdx b/apps/docs/docs/management/boards/index.mdx
index 990d58f9c..e004d75bd 100644
--- a/apps/docs/docs/management/boards/index.mdx
+++ b/apps/docs/docs/management/boards/index.mdx
@@ -34,7 +34,7 @@ Underscores and hyphen-minus are allowed.
 
 ### Column count
 
-Homarr has a complex drag-and-drop system that can be used from the browser.
+Homarr has a complex drag and drop system that can be used from the browser.
 The column count defines how many horizontal columns are available to drag and drop elements to.
 
 ### Public
@@ -270,7 +270,7 @@ Alternatively, you can also define it via your user profile:
 
 ### For whole server
 
-You can also set a global home board that will be used for all users who have not set a home board themselves.
+You can also set a global home board that will be used for all users that have not set a home board themselves.
 It will also be used for anonymous users.
 
 1. Navigate to the settings: `Management` > `Settings` > `Boards`
diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json
index 308e7cd26..1142ed3fb 100644
--- a/apps/docs/tsconfig.json
+++ b/apps/docs/tsconfig.json
@@ -26,5 +26,5 @@
     "**/*.md",
     "**/*.mdx",
   ],
-  "exclude": ["node_modules", "build", ".docusaurus"],
+  "exclude": ["node_modules"],
 }
diff --git a/apps/nextjs/next.config.ts b/apps/nextjs/next.config.ts
index 491cfa4c5..4ff31b9aa 100644
--- a/apps/nextjs/next.config.ts
+++ b/apps/nextjs/next.config.ts
@@ -5,7 +5,6 @@ import "@homarr/common/env";
 import "@homarr/core/infrastructure/logs/env";
 import "@homarr/docker/env";
 
-import path from "node:path";
 import type { NextConfig } from "next";
 import createNextIntlPlugin from "next-intl/plugin";
 
@@ -35,10 +34,6 @@ const nextConfig: NextConfig = {
     webpackMemoryOptimizations: true,
   },
   turbopack: {
-    // Keep Turbopack and output-file tracing inside this monorepo. Without an
-    // explicit root, an unrelated parent lockfile can make Next.js scan the
-    // entire parent directory and stall production builds.
-    root: path.join(import.meta.dirname, "../.."),
     // ponytail: known Turbopack NFT warning from path.join(process.cwd(), …) in
     // src/app/api/backup/{route,shared}.ts. No working placement in 16.2.x
     // (see vercel/next.js#95125). Suppress until upstream fix lands.
diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_guarded-history.spec.ts b/apps/nextjs/src/app/[locale]/boards/(content)/_guarded-history.spec.ts
deleted file mode 100644
index d96d80f09..000000000
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_guarded-history.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-import { classifyGuardedNavigation, removeGuardHistoryEntry, replaceGuardedSameDocumentUrl } from "./_guarded-history";
-
-describe("guarded board edit history", () => {
-  beforeEach(() => {
-    window.history.replaceState({ page: "board" }, "", "/boards/demo");
-  });
-
-  test("replaces the guard entry for same-document fragment navigation", () => {
-    const section = document.createElement("section");
-    section.id = "Media requests";
-    document.body.appendChild(section);
-    const scrollIntoView = vi.fn();
-    Object.defineProperty(section, "scrollIntoView", { value: scrollIntoView });
-
-    replaceGuardedSameDocumentUrl(new URL("/boards/demo#Media%20requests", window.location.href), {
-      key: "__guard",
-      id: "guard-id",
-    });
-
-    expect(window.location.hash).toBe("#Media%20requests");
-    expect(window.history.state).toStrictEqual({
-      page: "board",
-      __guard: "guard-id",
-    });
-    expect(scrollIntoView).toHaveBeenCalledOnce();
-    section.remove();
-  });
-
-  test("treats an explicit empty fragment as same-document navigation", () => {
-    const current = new URL(window.location.href);
-    const destination = new URL("#", current);
-
-    expect(classifyGuardedNavigation(destination, current)).toBe("same-document");
-  });
-
-  test("removes the guard while preserving the fragment when editing ends", () => {
-    window.history.replaceState({ page: "board", __guard: "guard-id" }, "", "/boards/demo#section");
-    const back = vi.spyOn(window.history, "back").mockImplementation(() => {
-      window.history.replaceState({ page: "board" }, "", "/boards/demo");
-      window.dispatchEvent(new PopStateEvent("popstate"));
-    });
-
-    removeGuardHistoryEntry("http://localhost:3000/boards/demo#section", "__guard");
-
-    expect(back).toHaveBeenCalledOnce();
-    expect(window.location.href).toBe("http://localhost:3000/boards/demo#section");
-    expect(window.history.state).toStrictEqual({ page: "board" });
-  });
-});
diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_guarded-history.ts b/apps/nextjs/src/app/[locale]/boards/(content)/_guarded-history.ts
deleted file mode 100644
index 29677f8e1..000000000
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_guarded-history.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-const getHistoryState = () =>
-  window.history.state && typeof window.history.state === "object"
-    ? (window.history.state as Record<string, unknown>)
-    : {};
-
-interface GuardState {
-  key: string;
-  id: string;
-}
-
-export const classifyGuardedNavigation = (destination: URL, current: URL) => {
-  if (destination.href === current.href) return "same-url";
-  if (
-    destination.origin === current.origin &&
-    destination.pathname === current.pathname &&
-    destination.search === current.search
-  ) {
-    return "same-document";
-  }
-  return "other-document";
-};
-
-export const replaceGuardedSameDocumentUrl = (destination: URL, guard: GuardState) => {
-  window.history.replaceState(
-    {
-      ...getHistoryState(),
-      [guard.key]: guard.id,
-    },
-    document.title,
-    destination.href,
-  );
-
-  if (!destination.hash) {
-    window.scrollTo({ top: 0, left: 0 });
-    return;
-  }
-
-  let targetId = destination.hash.slice(1);
-  try {
-    targetId = decodeURIComponent(targetId);
-  } catch {
-    // Keep the encoded value when the fragment contains malformed escape sequences.
-  }
-  document.getElementById(targetId)?.scrollIntoView();
-};
-
-export const removeGuardHistoryEntry = (guardedUrl: string, guardStateKey: string) => {
-  window.addEventListener(
-    "popstate",
-    () => {
-      const state = { ...getHistoryState() };
-      delete state[guardStateKey];
-      window.history.replaceState(state, document.title, guardedUrl);
-    },
-    { once: true },
-  );
-  window.history.back();
-};
diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx b/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx
index c3851055d..56cf5d6e7 100644
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx
@@ -55,8 +55,6 @@ import { CurrentColorSchemeCombobox } from "~/components/color-scheme/current-co
 import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
 import { HeaderButton } from "~/components/layout/header/button";
 
-import { classifyGuardedNavigation, removeGuardHistoryEntry, replaceGuardedSameDocumentUrl } from "./_guarded-history";
-
 export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   const [isEditMode] = useEditMode();
   const board = useRequiredBoard();
@@ -76,9 +74,9 @@ export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: bool
 
   return (
     <>
-      {isEditMode && <AddMenu />}
+      {isEditMode && !isMobile && <AddMenu />}
 
-      <EditModeMenu demoReadOnly={demoReadOnly} />
+      <EditModeMenu demoReadOnly={demoReadOnly} hidden={isMobile} />
 
       {!demoReadOnly && (
         <OnboardingTour.Target id="board-settings">
@@ -103,7 +101,6 @@ const AddMenu = () => {
   const { addDynamicSection } = useDynamicSectionActions();
   const { createItem } = useItemActions();
   const t = useI18n();
-  const canCreateApp = session?.user.permissions.includes("app-create") ?? false;
 
   const handleAddCategory = useCallback(
     () =>
@@ -119,7 +116,7 @@ const AddMenu = () => {
           submitLabel: t("section.category.create.submit"),
         },
         {
-          title: (translate) => translate("section.category.create.title"),
+          title: (t) => t("section.category.create.title"),
         },
       ),
     [addCategoryToEnd, openCategoryEditModal, t],
@@ -137,9 +134,9 @@ const AddMenu = () => {
           options: { appId: app.id },
         });
       },
-      withCreate: canCreateApp,
+      withCreate: session?.user.permissions.includes("app-create") ?? false,
     });
-  }, [openAppSelectModal, createItem, canCreateApp]);
+  }, [openAppSelectModal, createItem]);
 
   const handleAddIntegration = useCallback(() => {
     openIntegrationSelectModal({});
@@ -182,7 +179,7 @@ const AddMenu = () => {
   );
 };
 
-const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
+const EditModeMenu = ({ demoReadOnly, hidden }: { demoReadOnly: boolean; hidden: boolean }) => {
   const [isEditMode, { open, close }] = useEditMode();
   const board = useRequiredBoard();
   const utils = clientApi.useUtils();
@@ -212,14 +209,16 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   }, [utils, board.name, close]);
 
   const toggle = useCallback(() => {
+    if (hidden) return;
     if (isEditMode) {
       if (demoReadOnly) return discardDemoChanges();
       return saveBoard(board);
     }
     open();
-  }, [board, isEditMode, demoReadOnly, saveBoard, open, discardDemoChanges]);
+  }, [board, isEditMode, demoReadOnly, saveBoard, open, discardDemoChanges, hidden]);
 
   useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
+  if (hidden) return null;
 
   return (
     <OnboardingTour.Target id="board-edit-mode">
@@ -567,18 +566,8 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
       const target = event.target.closest<HTMLAnchorElement>(anchorSelector);
       if (!target) return;
 
-      const destination = new URL(target.href, window.location.href);
-      const current = new URL(window.location.href);
-      const navigationKind = classifyGuardedNavigation(destination, current);
-      if (navigationKind === "same-url") return;
-      if (navigationKind === "same-document") {
-        event.preventDefault();
-        guardedUrl = destination.href;
-        replaceGuardedSameDocumentUrl(destination, { key: guardStateKey, id: guardId });
-        return;
-      }
-
       event.preventDefault();
+      const destination = new URL(target.href, window.location.href);
 
       openLeaveConfirmation(() => {
         if (destination.origin === window.location.origin) {
@@ -659,7 +648,7 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
         window.location.href === guardedUrl &&
         (window.history.state as Record<string, unknown> | null)?.[guardStateKey] === guardId
       ) {
-        removeGuardHistoryEntry(guardedUrl, guardStateKey);
+        window.history.back();
       }
     };
   }, [isDirty]);
diff --git a/apps/nextjs/src/components/board/mobile/mobile-presentation.spec.ts b/apps/nextjs/src/components/board/mobile/mobile-presentation.spec.ts
index 0dcdeb4f9..45e59a506 100644
--- a/apps/nextjs/src/components/board/mobile/mobile-presentation.spec.ts
+++ b/apps/nextjs/src/components/board/mobile/mobile-presentation.spec.ts
@@ -18,20 +18,6 @@ describe("resolveMobileItemPresentation", () => {
     });
   });
 
-  test("does not unmount apps that use the eager default", () => {
-    expect(
-      resolveMobileItemPresentation(
-        { kind: "app", height: 1 },
-        {
-          unmountWhenOffscreen: true,
-        },
-      ),
-    ).toMatchObject({
-      eager: true,
-      unmountWhenOffscreen: false,
-    });
-  });
-
   test("defaults widgets to full width without inventing a detail view", () => {
     expect(resolveMobileItemPresentation({ kind: "calendar", height: 8 }, undefined)).toMatchObject({
       width: 2,
diff --git a/apps/nextjs/src/components/board/mobile/mobile-presentation.ts b/apps/nextjs/src/components/board/mobile/mobile-presentation.ts
index a88e7eec2..08125d5bf 100644
--- a/apps/nextjs/src/components/board/mobile/mobile-presentation.ts
+++ b/apps/nextjs/src/components/board/mobile/mobile-presentation.ts
@@ -8,7 +8,6 @@ export const resolveMobileItemPresentation = (
   const supportsCompactSummary = mobile?.supportsCompactSummary === true;
   const supportsDetails = mobile?.supportsDetailView === true;
   const usesGenericSummary = supportsDetails && !supportsCompactSummary;
-  const eager = mobile?.eager ?? (item.kind === "app" || item.kind === "bookmarks");
 
   return {
     width: mobile?.width ?? (item.kind === "app" ? 1 : 2),
@@ -16,8 +15,8 @@ export const resolveMobileItemPresentation = (
     displayMode: supportsCompactSummary || usesGenericSummary ? ("mobileSummary" as const) : ("default" as const),
     supportsDetails,
     usesGenericSummary,
-    eager,
-    unmountWhenOffscreen: eager ? false : (mobile?.unmountWhenOffscreen ?? false),
+    eager: mobile?.eager ?? (item.kind === "app" || item.kind === "bookmarks"),
+    unmountWhenOffscreen: mobile?.eager === true ? false : (mobile?.unmountWhenOffscreen ?? false),
   };
 };
 
diff --git a/apps/nextjs/src/components/board/use-mobile-board.spec.ts b/apps/nextjs/src/components/board/use-mobile-board.spec.ts
index 026f9767d..df8827ac5 100644
--- a/apps/nextjs/src/components/board/use-mobile-board.spec.ts
+++ b/apps/nextjs/src/components/board/use-mobile-board.spec.ts
@@ -12,7 +12,7 @@ describe("resolveMobileBoardViewport", () => {
       resolveMobileBoardViewport({
         deviceClass: "phone",
         matchesMobileWidth: false,
-        hasMounted: true,
+        hasResolvedClientWidth: true,
       }),
     ).toEqual({
       deviceClass: "phone",
@@ -29,7 +29,7 @@ describe("resolveMobileBoardViewport", () => {
       resolveMobileBoardViewport({
         deviceClass: "tablet",
         matchesMobileWidth,
-        hasMounted: true,
+        hasResolvedClientWidth: true,
       }).isMobile,
     ).toBe(expectedIsMobile);
   });
@@ -39,7 +39,7 @@ describe("resolveMobileBoardViewport", () => {
       resolveMobileBoardViewport({
         deviceClass: "tablet",
         matchesMobileWidth: false,
-        hasMounted: false,
+        hasResolvedClientWidth: false,
       }).isResolved,
     ).toBe(false);
   });
@@ -52,7 +52,7 @@ describe("resolveMobileBoardViewport", () => {
       resolveMobileBoardViewport({
         deviceClass: "desktop",
         matchesMobileWidth,
-        hasMounted: true,
+        hasResolvedClientWidth: true,
       }),
     ).toMatchObject({
       isMobile: expectedIsMobile,
@@ -73,9 +73,7 @@ describe("resolveIsAutomaticMobileBoard", () => {
       expect(resolveIsAutomaticMobileBoard({ isMobileViewport, enableAutomaticMobileLayout })).toBe(expected);
     },
   );
-});
 
-describe("shouldShowMobileBoardViewportSkeleton", () => {
   test("does not show the tablet resolution skeleton in legacy mode", () => {
     expect(
       shouldShowMobileBoardViewportSkeleton({
@@ -84,13 +82,4 @@ describe("shouldShowMobileBoardViewportSkeleton", () => {
       }),
     ).toBe(false);
   });
-
-  test("shows a skeleton while an automatic mobile viewport is unresolved", () => {
-    expect(
-      shouldShowMobileBoardViewportSkeleton({
-        enableAutomaticMobileLayout: true,
-        isResolved: false,
-      }),
-    ).toBe(true);
-  });
 });
diff --git a/apps/nextjs/src/components/board/use-mobile-board.tsx b/apps/nextjs/src/components/board/use-mobile-board.tsx
index cce597c61..1972206f2 100644
--- a/apps/nextjs/src/components/board/use-mobile-board.tsx
+++ b/apps/nextjs/src/components/board/use-mobile-board.tsx
@@ -26,15 +26,15 @@ const MobileBoardViewportContext = createContext<MobileBoardViewport>({
 export const resolveMobileBoardViewport = ({
   deviceClass,
   matchesMobileWidth,
-  hasMounted,
+  hasResolvedClientWidth,
 }: {
   deviceClass: MobileBoardDeviceClass;
   matchesMobileWidth: boolean;
-  hasMounted: boolean;
+  hasResolvedClientWidth: boolean;
 }): MobileBoardViewport => ({
   deviceClass,
   isMobile: deviceClass === "phone" || matchesMobileWidth,
-  isResolved: deviceClass !== "tablet" || hasMounted,
+  isResolved: deviceClass !== "tablet" || hasResolvedClientWidth,
 });
 
 const MobileBoardViewportSkeleton = () => (
@@ -73,19 +73,19 @@ export const MobileBoardViewportProvider = ({
   children,
 }: PropsWithChildren<{ initialDeviceClass: MobileBoardDeviceClass }>) => {
   const { enableAutomaticMobileLayout } = useSettings();
-  const [hasMounted, setHasMounted] = useState(false);
+  const [hasResolvedClientWidth, setHasResolvedClientWidth] = useState(false);
   const matchesMobileWidth = useMediaQuery(mobileBoardMediaQuery, initialDeviceClass === "phone", {
     getInitialValueInEffect: true,
   });
 
   useEffect(() => {
-    setHasMounted(true);
+    setHasResolvedClientWidth(true);
   }, []);
 
   const viewport = resolveMobileBoardViewport({
     deviceClass: initialDeviceClass,
     matchesMobileWidth,
-    hasMounted,
+    hasResolvedClientWidth,
   });
 
   return (
diff --git a/e2e/mobile-board.spec.ts b/e2e/mobile-board.spec.ts
index 879a3f595..6c929b16e 100644
--- a/e2e/mobile-board.spec.ts
+++ b/e2e/mobile-board.spec.ts
@@ -161,40 +161,15 @@ describe("Automatic mobile board", () => {
       await setAutomaticMobileLayoutAsync(loginPage, true);
       const storageState = await loginContext.storageState();
 
-      const iPhoneUserAgent = devices["iPhone 13"].userAgent;
-      const mobileViewports: {
-        name: string;
-        width: number;
-        height: number;
-        userAgent: string;
-        phone: boolean;
-        checksZoomOverflow?: boolean;
-        checksInteractions?: boolean;
-        reducedMotion?: boolean;
-      }[] = [
-        {
-          name: "small phone",
-          width: 320,
-          height: 568,
-          userAgent: iPhoneUserAgent,
-          phone: true,
-          checksZoomOverflow: true,
-        },
-        {
-          name: "phone",
-          width: 390,
-          height: 844,
-          userAgent: iPhoneUserAgent,
-          phone: true,
-          checksInteractions: true,
-          reducedMotion: true,
-        },
-        { name: "large phone", width: 430, height: 932, userAgent: iPhoneUserAgent, phone: true },
+      const mobileViewports = [
+        { name: "small phone", width: 320, height: 568, userAgent: devices["iPhone 13"].userAgent, phone: true },
+        { name: "phone", width: 390, height: 844, userAgent: devices["iPhone 13"].userAgent, phone: true },
+        { name: "large phone", width: 430, height: 932, userAgent: devices["iPhone 13"].userAgent, phone: true },
         {
           name: "phone landscape",
           width: 844,
           height: 390,
-          userAgent: iPhoneUserAgent,
+          userAgent: devices["iPhone 13"].userAgent,
           phone: true,
         },
         {
@@ -213,7 +188,7 @@ describe("Automatic mobile board", () => {
           userAgent: viewport.userAgent,
           hasTouch: true,
           isMobile: viewport.phone,
-          reducedMotion: viewport.reducedMotion ? "reduce" : "no-preference",
+          reducedMotion: viewport.width === 390 ? "reduce" : "no-preference",
         });
         const page = await context.newPage();
         await page.goto(`${baseUrl}/boards/${boardName}`);
@@ -259,7 +234,7 @@ describe("Automatic mobile board", () => {
         expect(layoutMetrics.outOfBoundsControls, viewport.name).toBe(0);
         expect(layoutMetrics.layoutControls, viewport.name).toBe(0);
 
-        if (viewport.checksZoomOverflow) {
+        if (viewport.width === 320) {
           await page.evaluate(() => {
             document.documentElement.style.fontSize = "200%";
           });
@@ -273,7 +248,7 @@ describe("Automatic mobile board", () => {
           expect(zoomOverflow.items).toBe(0);
         }
 
-        if (viewport.checksInteractions) {
+        if (viewport.width === 390) {
           await page.getByRole("button", { name: `Current board: ${boardName}` }).click();
           await expect(page.getByRole("menuitem", { name: boardName })).toBeDisabled();
           await page.keyboard.press("Escape");
diff --git a/packages/api/src/router/serverSettings.ts b/packages/api/src/router/serverSettings.ts
index 2a603c757..dc117fc0c 100644
--- a/packages/api/src/router/serverSettings.ts
+++ b/packages/api/src/router/serverSettings.ts
@@ -5,10 +5,10 @@ import { and, eq, inArray } from "@homarr/db";
 import {
   getServerSettingByKeyAsync,
   getServerSettingsAsync,
-  mergeServerSettingByKeyAsync,
+  insertServerSettingByKeyAsync,
   updateServerSettingByKeyAsync,
 } from "@homarr/db/queries";
-import { boards } from "@homarr/db/schema";
+import { boards, serverSettings } from "@homarr/db/schema";
 import type { ServerSettings } from "@homarr/server-settings";
 import { defaultServerSettingsKeys } from "@homarr/server-settings";
 import { settingsInitSchema } from "@homarr/validation/settings";
@@ -82,9 +82,17 @@ export const serverSettingsRouter = createTRPCRouter({
 
       const current = await getServerSettingByKeyAsync(ctx.db, "board");
       const next = { ...current, ...input };
-      await mergeServerSettingByKeyAsync(ctx.db, "board", next, input);
+      const existing = await ctx.db.query.serverSettings.findFirst({
+        where: eq(serverSettings.settingKey, "board"),
+      });
 
-      return await getServerSettingByKeyAsync(ctx.db, "board");
+      if (existing) {
+        await updateServerSettingByKeyAsync(ctx.db, "board", next);
+      } else {
+        await insertServerSettingByKeyAsync(ctx.db, "board", next);
+      }
+
+      return next;
     }),
   saveSettings: permissionRequiredProcedure
     .requiresPermission("admin")
@@ -100,7 +108,15 @@ export const serverSettingsRouter = createTRPCRouter({
         ...current,
         ...input.value,
       } as ServerSettings[keyof ServerSettings];
-      await mergeServerSettingByKeyAsync(ctx.db, input.settingsKey, next, input.value);
+      const existing = await ctx.db.query.serverSettings.findFirst({
+        where: eq(serverSettings.settingKey, input.settingsKey),
+      });
+
+      if (existing) {
+        await updateServerSettingByKeyAsync(ctx.db, input.settingsKey, next);
+      } else {
+        await insertServerSettingByKeyAsync(ctx.db, input.settingsKey, next);
+      }
     }),
   initSettings: onboardingProcedure
     .requiresStep("settings")
diff --git a/packages/api/src/router/test/serverSettings.spec.ts b/packages/api/src/router/test/serverSettings.spec.ts
index df1e917cf..d3d43b213 100644
--- a/packages/api/src/router/test/serverSettings.spec.ts
+++ b/packages/api/src/router/test/serverSettings.spec.ts
@@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest";
 
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
-import { boards, layouts, serverSettings } from "@homarr/db/schema";
+import { boards, serverSettings } from "@homarr/db/schema";
 import { createDb } from "@homarr/db/test";
 import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";
 
@@ -116,33 +116,6 @@ describe("saveSettings", () => {
       },
     ]);
   });
-
-  test("saveSettings should preserve concurrent partial updates", async () => {
-    const db = createDb();
-    const caller = serverSettingsRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSession,
-    });
-
-    await Promise.all([
-      caller.saveSettings({
-        settingsKey: "analytics",
-        value: { enableGeneral: false },
-      }),
-      caller.saveSettings({
-        settingsKey: "analytics",
-        value: { instanceId: "concurrent-instance" },
-      }),
-    ]);
-
-    await expect(caller.getAll()).resolves.toMatchObject({
-      analytics: {
-        enableGeneral: false,
-        instanceId: "concurrent-instance",
-      },
-    });
-  });
 });
 
 describe("board settings API", () => {
@@ -164,12 +137,6 @@ describe("board settings API", () => {
       deviceType: undefined,
       session: defaultSession,
     });
-    const boardId = createId();
-    await db.insert(boards).values({ id: boardId, name: "legacy", isPublic: false });
-    await db.insert(layouts).values([
-      { id: createId(), boardId, name: "Base", columnCount: 12, breakpoint: 0 },
-      { id: createId(), boardId, name: "Mobile", columnCount: 4, breakpoint: 480 },
-    ]);
     const legacyBoardSettings = {
       homeBoardId: defaultServerSettings.board.homeBoardId,
       mobileHomeBoardId: defaultServerSettings.board.mobileHomeBoardId,
@@ -181,10 +148,7 @@ describe("board settings API", () => {
       value: stringify(legacyBoardSettings),
     });
 
-    await expect(caller.getBoardSettings()).resolves.toStrictEqual({
-      ...defaultServerSettings.board,
-      enableAutomaticMobileLayout: false,
-    });
+    await expect(caller.getBoardSettings()).resolves.toStrictEqual(defaultServerSettings.board);
   });
 
   test("updateBoardSettings should insert settings when defaults are not persisted", async () => {
@@ -249,25 +213,6 @@ describe("board settings API", () => {
     ]);
   });
 
-  test("updateBoardSettings should preserve concurrent partial updates", async () => {
-    const db = createDb();
-    const caller = serverSettingsRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSession,
-    });
-
-    await Promise.all([
-      caller.updateBoardSettings({ forceDisableStatus: true }),
-      caller.updateBoardSettings({ enableStatusByDefault: false }),
-    ]);
-
-    await expect(caller.getBoardSettings()).resolves.toMatchObject({
-      forceDisableStatus: true,
-      enableStatusByDefault: false,
-    });
-  });
-
   test("updateBoardSettings should reject private home boards", async () => {
     const db = createDb();
     const caller = serverSettingsRouter.createCaller({
diff --git a/packages/api/src/router/widgets/media-release.ts b/packages/api/src/router/widgets/media-release.ts
index 426fe8eeb..b7c80ac39 100644
--- a/packages/api/src/router/widgets/media-release.ts
+++ b/packages/api/src/router/widgets/media-release.ts
@@ -2,7 +2,7 @@ import { getIntegrationKindsByCategory } from "@homarr/definitions";
 import { mediaReleaseRequestHandler } from "@homarr/request-handler/media-release";
 
 import { createManyIntegrationMiddleware } from "../../middlewares/integration";
-import { settleIntegrationQueriesWithProvenance } from "../../settle-integrations";
+import { getIntegrationQueryProvenance, settleIntegrationQueries } from "../../settle-integrations";
 import { createTRPCRouter, publicProcedure } from "../../trpc";
 
 const mediaReleasesProcedure = publicProcedure.concat(
@@ -12,7 +12,7 @@ const mediaReleasesProcedure = publicProcedure.concat(
 type MediaReleaseIntegration = Parameters<typeof mediaReleaseRequestHandler.handler>[0];
 
 const getMediaReleasesWithProvenanceAsync = async (integrations: MediaReleaseIntegration[]) => {
-  const { results, ...provenance } = await settleIntegrationQueriesWithProvenance(
+  const results = await settleIntegrationQueries(
     integrations,
     async (integration) => {
       const innerHandler = mediaReleaseRequestHandler.handler(integration, {});
@@ -40,7 +40,7 @@ const getMediaReleasesWithProvenanceAsync = async (integrations: MediaReleaseInt
 
   return {
     items,
-    ...provenance,
+    ...getIntegrationQueryProvenance(integrations.length, results),
   };
 };
 
diff --git a/packages/api/src/router/widgets/media-requests.ts b/packages/api/src/router/widgets/media-requests.ts
index 9120db53b..88d9b7698 100644
--- a/packages/api/src/router/widgets/media-requests.ts
+++ b/packages/api/src/router/widgets/media-requests.ts
@@ -11,7 +11,7 @@ import {
 import { mediaRequestStatsRequestHandler } from "@homarr/request-handler/media-request-stats";
 
 import { createManyIntegrationMiddleware, createOneIntegrationMiddleware } from "../../middlewares/integration";
-import { settleIntegrationQueriesWithProvenance } from "../../settle-integrations";
+import { getIntegrationQueryProvenance, settleIntegrationQueries } from "../../settle-integrations";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "../../trpc";
 
 const latestRequestsProcedure = publicProcedure
@@ -28,7 +28,7 @@ const getLatestRequestsWithProvenanceAsync = async (
   integrations: MediaRequestIntegration[],
   input: MediaRequestListInput,
 ) => {
-  const { results, ...provenance } = await settleIntegrationQueriesWithProvenance(
+  const results = await settleIntegrationQueries(
     integrations,
     async (integration) => {
       const { data, isStale } = await mediaRequestListRequestHandler
@@ -61,12 +61,12 @@ const getLatestRequestsWithProvenanceAsync = async (
 
   return {
     items,
-    ...provenance,
+    ...getIntegrationQueryProvenance(integrations.length, results),
   };
 };
 
 const getRequestStatsWithProvenanceAsync = async (integrations: MediaRequestStatsIntegration[]) => {
-  const { results, ...provenance } = await settleIntegrationQueriesWithProvenance(
+  const results = await settleIntegrationQueries(
     integrations,
     async (integration) => {
       const { data, isStale } = await mediaRequestStatsRequestHandler
@@ -92,7 +92,7 @@ const getRequestStatsWithProvenanceAsync = async (integrations: MediaRequestStat
       )
       .toSorted(({ requestCount: countA }, { requestCount: countB }) => countB - countA),
     integrations: results.map((result) => result.integration),
-    ...provenance,
+    ...getIntegrationQueryProvenance(integrations.length, results),
   };
 };
 
diff --git a/packages/api/src/settle-integrations.spec.ts b/packages/api/src/settle-integrations.spec.ts
index 34bdf43a9..efddcf136 100644
--- a/packages/api/src/settle-integrations.spec.ts
+++ b/packages/api/src/settle-integrations.spec.ts
@@ -2,7 +2,7 @@
 
 import { describe, expect, it, vi } from "vitest";
 
-import { settleIntegrationQueries, settleIntegrationQueriesWithProvenance } from "./settle-integrations";
+import { getIntegrationQueryProvenance, settleIntegrationQueries } from "./settle-integrations";
 
 const integrations = [
   { id: "first", name: "First", kind: "mock" },
@@ -77,23 +77,18 @@ describe("settleIntegrationQueries", () => {
   });
 });
 
-describe("settleIntegrationQueriesWithProvenance", () => {
-  it("counts failed queries even when fallbacks preserve the result count", async () => {
-    const { results, ...provenance } = await settleIntegrationQueriesWithProvenance(
-      integrations,
-      vi.fn(async (integration) => {
-        if (integration.id === "first") throw new Error("offline");
-        return { integrationId: integration.id, isStale: true };
-      }),
-      {
-        fallback: (integration) => ({ integrationId: integration.id, isStale: false }),
-      },
-    );
-
-    expect(results).toHaveLength(2);
-    expect(provenance).toEqual({
+describe("getIntegrationQueryProvenance", () => {
+  it("counts dropped and stale integration results independently", () => {
+    expect(getIntegrationQueryProvenance(4, [{ isStale: false }, { isStale: true }, { isStale: true }])).toEqual({
       failedIntegrationCount: 1,
-      staleIntegrationCount: 1,
+      staleIntegrationCount: 2,
+    });
+  });
+
+  it("does not report failures for complete current results", () => {
+    expect(getIntegrationQueryProvenance(2, [{ isStale: false }, {}])).toEqual({
+      failedIntegrationCount: 0,
+      staleIntegrationCount: 0,
     });
   });
 });
diff --git a/packages/api/src/settle-integrations.ts b/packages/api/src/settle-integrations.ts
index 1f2a0c235..a9dbff5ba 100644
--- a/packages/api/src/settle-integrations.ts
+++ b/packages/api/src/settle-integrations.ts
@@ -11,24 +11,13 @@ interface IntegrationLike {
 
 interface Options<TIntegration extends IntegrationLike, TResult> {
   fallback?: (integration: TIntegration, error: unknown) => TResult;
-  throwOnAllFailure?: boolean;
 }
 
-export interface IntegrationQueryProvenance {
-  failedIntegrationCount: number;
-  staleIntegrationCount: number;
-}
-
-interface IntegrationQuerySettlement<TResult> {
-  results: TResult[];
-  failedIntegrationCount: number;
-}
-
-const settleIntegrationQueriesInternal = async <TIntegration extends IntegrationLike, TResult>(
+export async function settleIntegrationQueries<TIntegration extends IntegrationLike, TResult>(
   integrations: TIntegration[],
   fn: (integration: TIntegration) => Promise<TResult>,
   options?: Options<TIntegration, TResult>,
-): Promise<IntegrationQuerySettlement<TResult>> => {
+): Promise<TResult[]> {
   const settled = await Promise.allSettled(integrations.map(async (integration) => fn(integration)));
   const results: TResult[] = [];
   const errors: unknown[] = [];
@@ -56,46 +45,9 @@ const settleIntegrationQueriesInternal = async <TIntegration extends Integration
     errors.push(result.reason);
   });
 
-  const firstFailure = settled.find((result) => result.status === "rejected");
-  if (
-    options?.throwOnAllFailure === true &&
-    settled.length > 0 &&
-    settled.every((result) => result.status === "rejected") &&
-    firstFailure?.status === "rejected"
-  ) {
-    throw firstFailure.reason;
-  }
-
-  if (options?.throwOnAllFailure !== false && results.length === 0 && errors.length > 0) {
+  if (results.length === 0 && errors.length > 0) {
     throw errors[0];
   }
 
-  return {
-    results,
-    failedIntegrationCount: settled.filter((result) => result.status === "rejected").length,
-  };
-};
-
-export async function settleIntegrationQueries<TIntegration extends IntegrationLike, TResult>(
-  integrations: TIntegration[],
-  fn: (integration: TIntegration) => Promise<TResult>,
-  options?: Options<TIntegration, TResult>,
-): Promise<TResult[]> {
-  return (await settleIntegrationQueriesInternal(integrations, fn, options)).results;
-}
-
-export async function settleIntegrationQueriesWithProvenance<
-  TIntegration extends IntegrationLike,
-  TResult extends { isStale?: boolean },
->(
-  integrations: TIntegration[],
-  fn: (integration: TIntegration) => Promise<TResult>,
-  options?: Options<TIntegration, TResult>,
-): Promise<IntegrationQuerySettlement<TResult> & IntegrationQueryProvenance> {
-  const settlement = await settleIntegrationQueriesInternal(integrations, fn, options);
-
-  return {
-    ...settlement,
-    staleIntegrationCount: settlement.results.filter((result) => result.isStale === true).length,
-  };
+  return results;
 }
diff --git a/packages/boards/src/context.spec.ts b/packages/boards/src/context.spec.ts
index 64a64732e..a4ebfcb25 100644
--- a/packages/boards/src/context.spec.ts
+++ b/packages/boards/src/context.spec.ts
@@ -30,17 +30,6 @@ describe("board layout selection", () => {
     expect(getCurrentLayout(createBoard(), false, viewportWidth)).toBe(expectedLayoutId);
   });
 
-  test("legacy mode falls back to the desktop layout before the client viewport is known", () => {
-    expect(getCurrentLayout(createBoard(), false, undefined)).toBe("large");
-  });
-
-  test("rejects boards without a layout", () => {
-    const board = { ...createBoard(), layouts: [] };
-
-    expect(() => getDesktopLayout(board)).toThrow("Board must have a layout");
-    expect(() => getCurrentLayout(board, false, 390)).toThrow("Board must have a layout");
-  });
-
   test("keeps every saved layout available for reversible mutations", () => {
     expect(getBoardLayouts(createBoard())).toEqual(["small", "medium", "large"]);
   });
diff --git a/packages/boards/src/edit-mode.spec.ts b/packages/boards/src/edit-mode.spec.ts
index 8650a3134..25bf237f8 100644
--- a/packages/boards/src/edit-mode.spec.ts
+++ b/packages/boards/src/edit-mode.spec.ts
@@ -27,15 +27,4 @@ describe("requestBoardEditAction", () => {
     void deferredAction?.();
     expect(action).toHaveBeenCalledOnce();
   });
-
-  test("reports rejected actions instead of creating an unhandled rejection", async () => {
-    const error = new Error("sign-out failed");
-    const reportError = vi.fn();
-    vi.stubGlobal("reportError", reportError);
-
-    requestBoardEditAction(() => Promise.reject(error));
-
-    await vi.waitFor(() => expect(reportError).toHaveBeenCalledWith(error));
-    vi.unstubAllGlobals();
-  });
 });
diff --git a/packages/boards/src/edit-mode.tsx b/packages/boards/src/edit-mode.tsx
index 857427b38..ce5395b30 100644
--- a/packages/boards/src/edit-mode.tsx
+++ b/packages/boards/src/edit-mode.tsx
@@ -12,27 +12,9 @@ export type BoardEditActionResult = boolean | void;
 export type BoardEditAction = () => BoardEditActionResult | Promise<BoardEditActionResult>;
 export type BoardEditActionEvent = CustomEvent<{ action: BoardEditAction }>;
 
-const reportBoardEditActionError = (error: unknown) => {
-  const reportError = (globalThis as { reportError?: (reportedError: unknown) => void }).reportError;
-  if (reportError) {
-    reportError(error);
-    return;
-  }
-
-  console.error("Board edit action failed", error);
-};
-
-const runBoardEditAction = (action: BoardEditAction) => {
-  try {
-    void Promise.resolve(action()).catch(reportBoardEditActionError);
-  } catch (error) {
-    reportBoardEditActionError(error);
-  }
-};
-
 export const requestBoardEditAction = (action: BoardEditAction) => {
   if (typeof document === "undefined") {
-    runBoardEditAction(action);
+    void action();
     return;
   }
 
@@ -42,7 +24,7 @@ export const requestBoardEditAction = (action: BoardEditAction) => {
   });
 
   if (document.dispatchEvent(event)) {
-    runBoardEditAction(action);
+    void action();
   }
 };
 
diff --git a/packages/db/collection.ts b/packages/db/collection.ts
index 7893435fd..00e5aba18 100644
--- a/packages/db/collection.ts
+++ b/packages/db/collection.ts
@@ -4,7 +4,7 @@ import { objectEntries } from "@homarr/common";
 import { dbEnv } from "@homarr/core/infrastructure/db/env";
 
 import type { HomarrDatabase, HomarrDatabaseMysql, HomarrDatabasePostgresql } from "./driver";
-import { schema } from "./schema";
+import * as schema from "./schema";
 
 type TableKey = {
   [K in keyof typeof schema]: (typeof schema)[K] extends { _: { brand: "Table" } } ? K : never;
diff --git a/packages/db/migrations/seed.spec.ts b/packages/db/migrations/seed.spec.ts
index 5346026c0..b9139ace1 100644
--- a/packages/db/migrations/seed.spec.ts
+++ b/packages/db/migrations/seed.spec.ts
@@ -37,15 +37,6 @@ describe("automatic mobile layout upgrade default", () => {
     ).toBe(false);
   });
 
-  test("preserves legacy mode when a board has duplicate canonical layouts", () => {
-    expect(
-      shouldEnableAutomaticMobileLayoutForUpgrade([
-        { boardId: "board", name: "Base", breakpoint: 0 },
-        { boardId: "board", name: "Base", breakpoint: 0 },
-      ]),
-    ).toBe(false);
-  });
-
   test.each([
     { boardId: "board", name: "Phone", breakpoint: 0 },
     { boardId: "board", name: "Base", breakpoint: 480 },
diff --git a/packages/db/queries/server-setting.ts b/packages/db/queries/server-setting.ts
index 18f967582..679db8752 100644
--- a/packages/db/queries/server-setting.ts
+++ b/packages/db/queries/server-setting.ts
@@ -4,12 +4,8 @@ import type { ServerSettings } from "@homarr/server-settings";
 import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";
 
 import type { Database } from "..";
-import { eq, sql } from "..";
-import { isMysql, isPostgresql } from "../collection";
-import type { HomarrDatabaseMysql, HomarrDatabasePostgresql } from "../driver";
+import { eq } from "..";
 import { serverSettings } from "../schema";
-import { serverSettings as mysqlServerSettings } from "../schema/mysql";
-import { serverSettings as postgresqlServerSettings } from "../schema/postgresql";
 
 interface ExistingBoardLayout {
   boardId: string;
@@ -49,7 +45,6 @@ const getAutomaticMobileLayoutUpgradeDefaultAsync = async (db: Database) => {
 
 export const getServerSettingsAsync = async (db: Database) => {
   const settings = await db.query.serverSettings.findMany();
-  let parsedBoardSettings: Partial<ServerSettings["board"]> = {};
 
   const mergedSettings = defaultServerSettingsKeys.reduce((acc, settingKey) => {
     const setting = settings.find((candidate) => candidate.settingKey === settingKey);
@@ -60,9 +55,6 @@ export const getServerSettingsAsync = async (db: Database) => {
     }
 
     const persistedSettings = parse<Record<string, unknown>>(setting.value);
-    if (settingKey === "board") {
-      parsedBoardSettings = persistedSettings as Partial<ServerSettings["board"]>;
-    }
     acc[settingKey] = {
       ...defaultServerSettings[settingKey],
       ...persistedSettings,
@@ -70,6 +62,11 @@ export const getServerSettingsAsync = async (db: Database) => {
     return acc;
   }, {} as ServerSettings);
 
+  const persistedBoardSettings = settings.find((setting) => setting.settingKey === "board");
+  const parsedBoardSettings = persistedBoardSettings
+    ? parse<Partial<ServerSettings["board"]>>(persistedBoardSettings.value)
+    : {};
+
   if (typeof parsedBoardSettings.enableAutomaticMobileLayout !== "boolean") {
     mergedSettings.board.enableAutomaticMobileLayout = await getAutomaticMobileLayoutUpgradeDefaultAsync(db);
   }
@@ -133,53 +130,3 @@ export const insertServerSettingByKeyAsync = async <TKey extends keyof ServerSet
     value: stringify(value),
   });
 };
-
-export const mergeServerSettingByKeyAsync = async <TKey extends keyof ServerSettings>(
-  db: Database,
-  key: TKey,
-  value: ServerSettings[TKey],
-  patch: Partial<ServerSettings[TKey]>,
-) => {
-  const serializedValue = stringify(value);
-  const serializedPatch = stringify(patch);
-
-  if (isMysql()) {
-    await (db as unknown as HomarrDatabaseMysql)
-      .insert(mysqlServerSettings)
-      .values({ settingKey: key, value: serializedValue })
-      .onDuplicateKeyUpdate({
-        set: {
-          value: sql`JSON_MERGE_PATCH(${mysqlServerSettings.value}, ${serializedPatch})`,
-        },
-      });
-    return;
-  }
-
-  if (isPostgresql()) {
-    await (db as unknown as HomarrDatabasePostgresql)
-      .insert(postgresqlServerSettings)
-      .values({ settingKey: key, value: serializedValue })
-      .onConflictDoUpdate({
-        target: postgresqlServerSettings.settingKey,
-        set: {
-          value: sql`jsonb_set(
-            ${postgresqlServerSettings.value}::jsonb,
-            '{json}',
-            (${postgresqlServerSettings.value}::jsonb -> 'json') || (${serializedPatch}::jsonb -> 'json'),
-            true
-          )::text`,
-        },
-      });
-    return;
-  }
-
-  await db
-    .insert(serverSettings)
-    .values({ settingKey: key, value: serializedValue })
-    .onConflictDoUpdate({
-      target: serverSettings.settingKey,
-      set: {
-        value: sql`json_patch(${serverSettings.value}, ${serializedPatch})`,
-      },
-    });
-};
diff --git a/packages/db/test/schema.spec.ts b/packages/db/test/schema.spec.ts
index 6606636e1..246219547 100644
--- a/packages/db/test/schema.spec.ts
+++ b/packages/db/test/schema.spec.ts
@@ -11,9 +11,6 @@ import * as mysqlSchema from "../schema/mysql";
 import * as postgresqlSchema from "../schema/postgresql";
 import * as sqliteSchema from "../schema/sqlite";
 
-const mysqlTables = { ...mysqlSchema };
-const postgresqlTables = { ...postgresqlSchema };
-
 // We need the following three types as there is currently no support for Buffer in mysql & pg and
 // so we use a custom type which results in the config beeing different
 type FixedMysqlConfig = {
@@ -66,7 +63,7 @@ test("schemas should match", () => {
       if (!("uniqueName" in sqliteColumn)) return;
       if (!("primary" in sqliteColumn)) return;
 
-      const mysqlTable = mysqlTables[tableName];
+      const mysqlTable = mysqlSchema[tableName];
 
       const mysqlColumn = mysqlTable[columnName as keyof typeof mysqlTable] as object;
       if (!("isUnique" in mysqlColumn)) return;
@@ -87,7 +84,7 @@ test("schemas should match", () => {
       ).toEqual(mysqlColumn.primary);
     });
 
-    const mysqlTable = mysqlTables[tableName];
+    const mysqlTable = mysqlSchema[tableName];
     const sqliteForeignKeys = sqliteTable[Symbol.for("drizzle:SQLiteInlineForeignKeys") as keyof typeof sqliteTable] as
       | SqliteForeignKey[]
       | undefined;
@@ -147,7 +144,7 @@ test("schemas should match for postgresql", () => {
   objectEntries(sqliteSchema).forEach(([tableName, sqliteTable]) => {
     // keys of sqliteSchema and postgresqlSchema are the same, so we can safely use tableName as key
     // skipcq: JS-E1007
-    const postgresqlTable = postgresqlTables[tableName];
+    const postgresqlTable = postgresqlSchema[tableName];
     Object.entries(sqliteTable).forEach(([columnName, sqliteColumn]: [string, object]) => {
       if (!("isUnique" in sqliteColumn)) return;
       if (!("uniqueName" in sqliteColumn)) return;
diff --git a/packages/request-handler/src/lib/request-handler.spec.ts b/packages/request-handler/src/lib/request-handler.spec.ts
index f0b36bcec..7141572ba 100644
--- a/packages/request-handler/src/lib/request-handler.spec.ts
+++ b/packages/request-handler/src/lib/request-handler.spec.ts
@@ -4,17 +4,6 @@ import { describe, expect, test, vi } from "vitest";
 
 import { createRequestHandler } from "./request-handler";
 
-const createDeferred = <T>() => {
-  let resolve!: (value: T) => void;
-  let reject!: (reason: unknown) => void;
-  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
-    resolve = resolvePromise;
-    reject = rejectPromise;
-  });
-
-  return { promise, reject, resolve };
-};
-
 describe("createRequestHandler", () => {
   test("keeps the standard result contract free of cache provenance", async () => {
     const requestHandler = createRequestHandler({
@@ -58,47 +47,4 @@ describe("createRequestHandler", () => {
       "offline",
     );
   });
-
-  test("does not let a pre-invalidation request overwrite a newer cached result", async () => {
-    const first = createDeferred<string>();
-    const second = createDeferred<string>();
-    const requestAsync = vi.fn().mockReturnValueOnce(first.promise).mockReturnValueOnce(second.promise);
-    const requestHandler = createRequestHandler({ requestAsync });
-    const handler = requestHandler.handler({ integrationId: "first" });
-
-    const oldRequest = handler.getDataWithProvenanceAsync();
-    requestHandler.invalidateCache();
-    const newRequest = handler.getDataWithProvenanceAsync();
-
-    second.resolve("new");
-    await expect(newRequest).resolves.toMatchObject({ data: "new" });
-    first.resolve("old");
-    await expect(oldRequest).resolves.toMatchObject({ data: "old" });
-
-    await expect(handler.getDataWithProvenanceAsync()).resolves.toMatchObject({ data: "new" });
-    expect(requestAsync).toHaveBeenCalledTimes(2);
-  });
-
-  test("does not let a pre-invalidation request clear a newer inflight request", async () => {
-    const first = createDeferred<string>();
-    const second = createDeferred<string>();
-    const requestAsync = vi.fn().mockReturnValueOnce(first.promise).mockReturnValueOnce(second.promise);
-    const requestHandler = createRequestHandler({ requestAsync });
-    const handler = requestHandler.handler({ integrationId: "first" });
-
-    const oldRequest = handler.getDataWithProvenanceAsync();
-    requestHandler.invalidateCache();
-    const newRequest = handler.getDataWithProvenanceAsync();
-
-    first.resolve("old");
-    await expect(oldRequest).resolves.toMatchObject({ data: "old" });
-    const sharedNewRequest = handler.getDataWithProvenanceAsync();
-    expect(requestAsync).toHaveBeenCalledTimes(2);
-
-    second.resolve("new");
-    await expect(Promise.all([newRequest, sharedNewRequest])).resolves.toEqual([
-      expect.objectContaining({ data: "new" }),
-      expect.objectContaining({ data: "new" }),
-    ]);
-  });
 });
diff --git a/packages/request-handler/src/lib/request-handler.ts b/packages/request-handler/src/lib/request-handler.ts
index 5e57328a3..d45c4371d 100644
--- a/packages/request-handler/src/lib/request-handler.ts
+++ b/packages/request-handler/src/lib/request-handler.ts
@@ -22,11 +22,9 @@ export const createRequestHandler = <TData, TInput extends Record<string, unknow
 ) => {
   const cache = new Map<string, CacheEntry<TData>>();
   const inflight = new Map<string, Promise<RequestResult<TData>>>();
-  let cacheGeneration = 0;
 
   return {
     invalidateCache: () => {
-      cacheGeneration += 1;
       cache.clear();
       inflight.clear();
     },
@@ -43,29 +41,21 @@ export const createRequestHandler = <TData, TInput extends Record<string, unknow
         const existing = inflight.get(key);
         if (existing) return existing;
 
-        const requestGeneration = cacheGeneration;
-        let promise: Promise<RequestResult<TData>>;
-        const isCurrentRequest = () => requestGeneration === cacheGeneration && inflight.get(key) === promise;
-
-        promise = options
+        const promise = options
           .requestAsync(input)
           .then((data) => {
-            const entry: CacheEntry<TData> = { data, timestamp: new Date(), expiresAt: Date.now() + ttl };
-
-            if (isCurrentRequest()) {
-              if (cache.size >= MAX_CACHE_SIZE) evictExpired(cache);
-              if (cache.size >= MAX_CACHE_SIZE) {
-                const oldest = cache.keys().next().value;
-                if (oldest) cache.delete(oldest);
-              }
-              cache.set(key, entry);
-              inflight.delete(key);
+            if (cache.size >= MAX_CACHE_SIZE) evictExpired(cache);
+            if (cache.size >= MAX_CACHE_SIZE) {
+              const oldest = cache.keys().next().value;
+              if (oldest) cache.delete(oldest);
             }
-
+            const entry: CacheEntry<TData> = { data, timestamp: new Date(), expiresAt: Date.now() + ttl };
+            cache.set(key, entry);
+            inflight.delete(key);
             return { data: entry.data, timestamp: entry.timestamp, isStale: false };
           })
           .catch((err) => {
-            if (isCurrentRequest()) inflight.delete(key);
+            inflight.delete(key);
             if (options.fallbackToStaleOnError && cached) {
               return { data: cached.data, timestamp: cached.timestamp, isStale: true };
             }
diff --git a/packages/translation/src/lang/en.json b/packages/translation/src/lang/en.json
index 5faf0e5a5..9b86b67bb 100644
--- a/packages/translation/src/lang/en.json
+++ b/packages/translation/src/lang/en.json
@@ -3295,7 +3295,6 @@
           "main": "Media Stats",
           "approved": "Already approved",
           "pending": "Pending approvals",
-          "pendingCount": "{pending} pending approvals",
           "processing": "Being processed",
           "declined": "Already declined",
           "available": "Already Available",
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 32aed4f48..2f835dafd 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -75,7 +75,6 @@
     "@tiptap/starter-kit": "catalog:",
     "clsx": "catalog:",
     "dayjs": "catalog:",
-    "isomorphic-dompurify": "catalog:",
     "jsonpath-plus": "catalog:",
     "lucide-react": "catalog:",
     "mantine-datatable": "catalog:",
diff --git a/packages/widgets/src/common/query-state.spec.ts b/packages/widgets/src/common/query-state.spec.ts
index 6f08e5ca5..e724b3e66 100644
--- a/packages/widgets/src/common/query-state.spec.ts
+++ b/packages/widgets/src/common/query-state.spec.ts
@@ -1,14 +1,6 @@
-import { MantineProvider } from "@mantine/core";
-import { createElement } from "react";
-import type { ComponentProps } from "react";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, test, vi } from "vitest";
+import { describe, expect, test } from "vitest";
 
-import { hasWidgetDataWarning, throwOnInitialQueryError, WidgetDataState } from "./query-state";
-
-vi.mock("@homarr/translation/client", () => ({
-  useI18n: () => () => "Some widget data may be stale",
-}));
+import { hasWidgetDataWarning, throwOnInitialQueryError } from "./query-state";
 
 describe("widget query state", () => {
   test.each([
@@ -39,22 +31,4 @@ describe("widget query state", () => {
   test("keeps cached data visible after a refresh error", () => {
     expect(() => throwOnInitialQueryError(new Error("refresh failed"), true)).not.toThrow();
   });
-
-  test("places the warning after widget controls in keyboard focus order", () => {
-    const markup = renderToStaticMarkup(
-      createElement(
-        MantineProvider,
-        null,
-        createElement(
-          WidgetDataState,
-          { hasWarning: true } as ComponentProps<typeof WidgetDataState>,
-          createElement("button", { type: "button" }, "Widget action"),
-        ),
-      ),
-    );
-    const document = new DOMParser().parseFromString(markup, "text/html");
-    const focusableElements = [...document.querySelectorAll("button, [tabindex='0']")];
-
-    expect(focusableElements.map((element) => element.tagName)).toStrictEqual(["BUTTON", "OUTPUT"]);
-  });
 });
diff --git a/packages/widgets/src/common/query-state.tsx b/packages/widgets/src/common/query-state.tsx
index 250ab48be..2347a8b57 100644
--- a/packages/widgets/src/common/query-state.tsx
+++ b/packages/widgets/src/common/query-state.tsx
@@ -43,13 +43,11 @@ export function WidgetDataState({ children, hasWarning }: WidgetDataStateProps)
 
   return (
     <Box pos="relative" h="100%" w="100%">
-      {children}
       {hasWarning && (
-        <Tooltip label={label} position="left" withArrow events={{ hover: true, focus: true, touch: true }}>
+        <Tooltip label={label} position="left" withArrow>
           <Center
             component="output"
             aria-label={label}
-            tabIndex={0}
             pos="absolute"
             bottom={4}
             w={28}
@@ -69,6 +67,7 @@ export function WidgetDataState({ children, hasWarning }: WidgetDataStateProps)
           </Center>
         </Tooltip>
       )}
+      {children}
     </Box>
   );
 }
diff --git a/packages/widgets/src/media-missing/component.tsx b/packages/widgets/src/media-missing/component.tsx
index 297ec515b..2bb3b482c 100644
--- a/packages/widgets/src/media-missing/component.tsx
+++ b/packages/widgets/src/media-missing/component.tsx
@@ -24,7 +24,6 @@ import { useScopedI18n } from "@homarr/translation/client";
 
 import { WidgetEmptyState } from "../common/empty-state";
 import { WidgetMobileLoading, WidgetMobileSummary } from "../common/mobile-summary";
-import { hasWidgetDataWarning, WidgetDataState } from "../common/query-state";
 import type { WidgetComponentProps } from "../definition";
 import { NoIntegrationDataError } from "../errors/no-data-integration";
 import classes from "./component.module.css";
@@ -60,11 +59,6 @@ export default function MediaMissingWidget({
   const queued = data.flatMap((entry) => entry.queued.map((item) => ({ item, integrationId: entry.integrationId })));
   const missingCount = data.reduce((sum, entry) => sum + entry.missingCount, 0);
   const queuedCount = data.reduce((sum, entry) => sum + entry.queuedCount, 0);
-  const hasDataWarning = hasWidgetDataWarning({
-    error,
-    expectedIntegrationCount: integrationIds.length,
-    receivedIntegrationCount: data.length,
-  });
 
   if (displayMode === "mobileSummary") {
     const primary = options.showMissing
@@ -77,7 +71,7 @@ export default function MediaMissingWidget({
         value={primary.value}
         label={primary.label}
         description={description}
-        isStale={hasDataWarning}
+        isStale={Boolean(error)}
       />
     );
   }
@@ -112,37 +106,35 @@ export default function MediaMissingWidget({
   );
 
   return (
-    <WidgetDataState hasWarning={hasDataWarning}>
-      <Tabs
-        defaultValue={options.showMissing ? "missing" : "queued"}
-        h="100%"
-        style={{ display: "flex", flexDirection: "column" }}
-      >
-        <Tabs.List grow>
-          {options.showMissing && (
-            <Tabs.Tab value="missing" px={isThin ? 6 : undefined} leftSection={<IconQuestionMark size={14} />}>
-              {tabLabel(t("tab.missing"), missing.length, missingCount)}
-            </Tabs.Tab>
-          )}
-          {options.showQueued && (
-            <Tabs.Tab value="queued" px={isThin ? 6 : undefined} leftSection={<IconDownload size={14} />}>
-              {tabLabel(t("tab.queued"), queued.length, queuedCount)}
-            </Tabs.Tab>
-          )}
-        </Tabs.List>
-
+    <Tabs
+      defaultValue={options.showMissing ? "missing" : "queued"}
+      h="100%"
+      style={{ display: "flex", flexDirection: "column" }}
+    >
+      <Tabs.List grow>
         {options.showMissing && (
-          <Tabs.Panel value="missing" flex={1} style={{ overflow: "hidden" }}>
-            {renderPanel(missing, t("empty.missing"))}
-          </Tabs.Panel>
+          <Tabs.Tab value="missing" px={isThin ? 6 : undefined} leftSection={<IconQuestionMark size={14} />}>
+            {tabLabel(t("tab.missing"), missing.length, missingCount)}
+          </Tabs.Tab>
         )}
         {options.showQueued && (
-          <Tabs.Panel value="queued" flex={1} style={{ overflow: "hidden" }}>
-            {renderPanel(queued, t("empty.queued"))}
-          </Tabs.Panel>
+          <Tabs.Tab value="queued" px={isThin ? 6 : undefined} leftSection={<IconDownload size={14} />}>
+            {tabLabel(t("tab.queued"), queued.length, queuedCount)}
+          </Tabs.Tab>
         )}
-      </Tabs>
-    </WidgetDataState>
+      </Tabs.List>
+
+      {options.showMissing && (
+        <Tabs.Panel value="missing" flex={1} style={{ overflow: "hidden" }}>
+          {renderPanel(missing, t("empty.missing"))}
+        </Tabs.Panel>
+      )}
+      {options.showQueued && (
+        <Tabs.Panel value="queued" flex={1} style={{ overflow: "hidden" }}>
+          {renderPanel(queued, t("empty.queued"))}
+        </Tabs.Panel>
+      )}
+    </Tabs>
   );
 }
 
diff --git a/packages/widgets/src/media-requests/stats/component.tsx b/packages/widgets/src/media-requests/stats/component.tsx
index bbbaf3c01..49f586f74 100644
--- a/packages/widgets/src/media-requests/stats/component.tsx
+++ b/packages/widgets/src/media-requests/stats/component.tsx
@@ -112,7 +112,7 @@ export default function MediaServerWidget({
       <WidgetMobileSummary
         value={total}
         label={t("titles.stats.total")}
-        description={t("titles.stats.pendingCount", { pending })}
+        description={`${pending} ${t("titles.stats.pending")}`}
         isStale={hasWarning}
       />
     );
diff --git a/packages/widgets/src/rssFeed/component.tsx b/packages/widgets/src/rssFeed/component.tsx
index 325b20af6..37c3400a6 100644
--- a/packages/widgets/src/rssFeed/component.tsx
+++ b/packages/widgets/src/rssFeed/component.tsx
@@ -10,7 +10,6 @@ import { useRequiredBoard } from "@homarr/boards/context";
 
 import type { WidgetComponentProps } from "../definition";
 import classes from "./component.module.scss";
-import { sanitizeFeedDescription } from "./sanitize-description";
 
 const useLiveFeedEntries = (input: RouterInputs["widget"]["rssFeed"]["getFeeds"]) => {
   const { data: feedEntries = [] } = clientApi.widget.rssFeed.getFeeds.useQuery(input);
@@ -57,11 +56,12 @@ export default function RssFeed({ options, width, displayMode }: WidgetComponent
               </Text>
               {!options.hideDescription && feedEntry.description && (
                 <Text
+                  className={feedEntry.description}
                   dir={languageDir}
                   c="dimmed"
                   size="sm"
                   lineClamp={options.textLinesClamp}
-                  dangerouslySetInnerHTML={{ __html: sanitizeFeedDescription(feedEntry.description) }}
+                  dangerouslySetInnerHTML={{ __html: feedEntry.description }}
                 />
               )}
 
diff --git a/packages/widgets/src/rssFeed/sanitize-description.spec.ts b/packages/widgets/src/rssFeed/sanitize-description.spec.ts
deleted file mode 100644
index 1f3439274..000000000
--- a/packages/widgets/src/rssFeed/sanitize-description.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import { sanitizeFeedDescription } from "./sanitize-description";
-
-describe("sanitizeFeedDescription", () => {
-  test("keeps basic formatting while removing executable markup", () => {
-    const description =
-      '<p onclick="alert(1)" aria-hidden="true" data-tracking="yes">News <strong>today</strong><script>alert(2)</script><img src="tracker"></p>';
-
-    expect(sanitizeFeedDescription(description)).toBe("<p>News <strong>today</strong></p>");
-  });
-});
diff --git a/packages/widgets/src/rssFeed/sanitize-description.ts b/packages/widgets/src/rssFeed/sanitize-description.ts
deleted file mode 100644
index 811d5f2b0..000000000
--- a/packages/widgets/src/rssFeed/sanitize-description.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { sanitize } from "isomorphic-dompurify";
-
-const allowedDescriptionTags = ["b", "br", "em", "i", "li", "ol", "p", "s", "strong", "u", "ul"];
-
-export const sanitizeFeedDescription = (description: string) =>
-  sanitize(description, {
-    ALLOW_ARIA_ATTR: false,
-    ALLOW_DATA_ATTR: false,
-    ALLOWED_ATTR: [],
-    ALLOWED_TAGS: allowedDescriptionTags,
-  });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d0bdc983..d9dca5084 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2656,9 +2656,6 @@ importers:
       dayjs:
         specifier: 'catalog:'
         version: 1.11.21
-      isomorphic-dompurify:
-        specifier: 'catalog:'
-        version: 3.18.0(@noble/hashes@2.0.1)
       jsonpath-plus:
         specifier: 'catalog:'
         version: 10.4.0