diff --git a/apps/web/lib/swr/use-workspace-store.ts b/apps/web/lib/swr/use-workspace-store.ts
index fa3838d24a..79342cf7d2 100644
--- a/apps/web/lib/swr/use-workspace-store.ts
+++ b/apps/web/lib/swr/use-workspace-store.ts
@@ -8,6 +8,7 @@ import useWorkspace from "./use-workspace";
 
 export const STORE_KEYS = {
   conversionsOnboarding: "conversionsOnboarding",
+  linksDisplay: "linksDisplay",
 };
 
 export function useWorkspaceStore<T>(
diff --git a/apps/web/ui/links/link-display.tsx b/apps/web/ui/links/link-display.tsx
index 39ad7f1adc..020c8af934 100644
--- a/apps/web/ui/links/link-display.tsx
+++ b/apps/web/ui/links/link-display.tsx
@@ -31,6 +31,7 @@ export default function LinkDisplay() {
     setShowArchived,
     displayProperties,
     setDisplayProperties,
+    isLoading,
     isDirty,
     persist,
     reset,
@@ -39,7 +40,7 @@ export default function LinkDisplay() {
   const [openPopover, setOpenPopover] = useState(false);
   const { queryParams } = useRouterStuff();
 
-  useKeyboardShortcut("a", () => setShowArchived((o) => !o));
+  useKeyboardShortcut("a", () => setShowArchived(!showArchived));
 
   return (
     <Popover
@@ -170,7 +171,14 @@ export default function LinkDisplay() {
                     className="h-8 w-auto px-2"
                     variant="primary"
                     text="Set as default"
-                    onClick={persist}
+                    onClick={() => {
+                      if (
+                        window.confirm(
+                          "Set this configuration as the default for everyone in this workspace?",
+                        )
+                      )
+                        persist();
+                    }}
                   />
                 </div>
               </motion.div>
@@ -183,13 +191,14 @@ export default function LinkDisplay() {
     >
       <Button
         variant="secondary"
+        disabled={isLoading}
         className="hover:bg-white [&>div]:w-full"
         textWrapperClassName="!overflow-visible"
         text={
           <div className="flex w-full items-center gap-2">
             <div className="relative shrink-0">
               <Sliders className="h-4 w-4" />
-              {isDirty && (
+              {isDirty && !isLoading && (
                 <div className="absolute -right-0.5 -top-0.5 size-2 rounded-full bg-blue-500">
                   <div className="h-full w-full animate-pulse rounded-full ring-2 ring-blue-500/40" />
                 </div>
diff --git a/apps/web/ui/links/links-display-provider.tsx b/apps/web/ui/links/links-display-provider.tsx
index 4d7cdf7736..e6dbb102a1 100644
--- a/apps/web/ui/links/links-display-provider.tsx
+++ b/apps/web/ui/links/links-display-provider.tsx
@@ -1,13 +1,6 @@
+import { STORE_KEYS, useWorkspaceStore } from "@/lib/swr/use-workspace-store";
 import { useLocalStorage } from "@dub/ui";
-import { useSearchParams } from "next/navigation";
-import {
-  Dispatch,
-  PropsWithChildren,
-  SetStateAction,
-  createContext,
-  useMemo,
-  useState,
-} from "react";
+import { PropsWithChildren, createContext, useMemo } from "react";
 
 export const linkViewModes = ["cards", "rows"] as const;
 
@@ -65,6 +58,9 @@ export const linkDisplayProperties: {
 
 export type LinkDisplayProperty = (typeof linkDisplayPropertyIds)[number];
 
+const defaultViewMode = linkViewModes[0];
+const defaultSortBy = sortOptions[0].slug;
+const defaultShowArchived = false;
 export const defaultDisplayProperties: LinkDisplayProperty[] = [
   "icon",
   "link",
@@ -75,37 +71,40 @@ export const defaultDisplayProperties: LinkDisplayProperty[] = [
   "analytics",
 ];
 
+type PersistedLinksDisplay = {
+  viewMode: LinksViewMode;
+  sortBy: LinksSortSlug;
+  showArchived: boolean;
+  displayProperties: LinkDisplayProperty[];
+};
+
 function useLinksDisplayOption<T>(
   key: string,
-  parsePersisted: (value: T) => T,
   defaultValue: T,
-  overrideValue?: T,
+  parseValue: (value: any) => T,
 ) {
-  const [valuePersisted, setValuePersisted] = useLocalStorage<T>(
+  const [value, setValue, { remove }] = useLocalStorage<T | undefined>(
     `links-display-${key}`,
-    defaultValue,
+    undefined,
   );
-  const [value, setValue] = useState(overrideValue ?? valuePersisted);
 
   return {
-    value,
+    value: parseValue(value ?? defaultValue),
     setValue,
-    valuePersisted,
-    setValuePersisted,
-    persist: () => setValuePersisted(value),
-    reset: () => setValue(parsePersisted(valuePersisted)),
+    reset: remove,
   };
 }
 
 export const LinksDisplayContext = createContext<{
   viewMode: LinksViewMode;
-  setViewMode: Dispatch<SetStateAction<LinksViewMode>>;
+  setViewMode: (mode: LinksViewMode) => void;
   displayProperties: LinkDisplayProperty[];
-  setDisplayProperties: Dispatch<SetStateAction<LinkDisplayProperty[]>>;
+  setDisplayProperties: (properties: LinkDisplayProperty[]) => void;
   sortBy: LinksSortSlug;
-  setSort: Dispatch<SetStateAction<LinksSortSlug>>;
+  setSort: (sort: LinksSortSlug) => void;
   showArchived: boolean;
-  setShowArchived: Dispatch<SetStateAction<boolean>>;
+  setShowArchived: (show: boolean) => void;
+  isLoading: boolean;
   isDirty: boolean;
   persist: () => void;
   reset: () => void;
@@ -118,6 +117,8 @@ export const LinksDisplayContext = createContext<{
   setSort: () => {},
   showArchived: false,
   setShowArchived: () => {},
+  /** Whether the persisted values are being loaded */
+  isLoading: false,
   /** Whether the current values differ from the persisted values */
   isDirty: false,
   /** Updates the persisted values to the current values */
@@ -134,77 +135,79 @@ const parseDisplayProperties = (displayPropertiesRaw: string[]) =>
     (p) => displayPropertiesRaw.findIndex((pr) => pr === p) !== -1,
   );
 
-const parseSort = (sort: string) =>
-  sortOptions.find(({ slug }) => slug === sort)?.slug ?? sortOptions[0].slug;
+const parseSortBy = (sortBy: string) =>
+  sortOptions.find(({ slug }) => slug === sortBy)?.slug ?? sortOptions[0].slug;
 
 const parseShowArchived = (showArchived: boolean) => showArchived === true;
 
+const parseObject = (object: any): PersistedLinksDisplay | undefined =>
+  object
+    ? {
+        viewMode: parseViewMode(object.viewMode),
+        sortBy: parseSortBy(object.sortBy),
+        showArchived: parseShowArchived(object.showArchived),
+        displayProperties: parseDisplayProperties(object.displayProperties),
+      }
+    : undefined;
+
 export function LinksDisplayProvider({ children }: PropsWithChildren) {
-  const searchParams = useSearchParams();
-  const sortRaw = searchParams?.get("sortBy");
-  const showArchivedRaw = searchParams?.get("showArchived");
+  // Persisted values to workspace store
+  const [persistedRaw, setPersisted, { loading: isLoading }] =
+    useWorkspaceStore<PersistedLinksDisplay>(STORE_KEYS.linksDisplay);
+  const persisted = useMemo(() => parseObject(persistedRaw), [persistedRaw]);
 
   // View mode
   const {
     value: viewMode,
     setValue: setViewMode,
-    valuePersisted: viewModePersisted,
-    persist: persistViewMode,
     reset: resetViewMode,
-  } = useLinksDisplayOption<string>(
+  } = useLinksDisplayOption<LinksViewMode>(
     "view-mode",
+    persisted?.viewMode ?? defaultViewMode,
     parseViewMode,
-    linkViewModes[0],
   );
 
   // Sort
   const {
     value: sortBy,
     setValue: setSort,
-    valuePersisted: sortPersisted,
-    persist: persistSort,
     reset: resetSort,
-  } = useLinksDisplayOption<string>(
+  } = useLinksDisplayOption<LinksSortSlug>(
     "sortBy",
-    parseSort,
-    sortOptions[0].slug,
-    sortRaw ? parseSort(sortRaw) : undefined,
+    persisted?.sortBy ?? defaultSortBy,
+    parseSortBy,
   );
 
   // Show archived
   const {
     value: showArchived,
     setValue: setShowArchived,
-    valuePersisted: showArchivedPersisted,
-    persist: persistShowArchived,
     reset: resetShowArchived,
   } = useLinksDisplayOption<boolean>(
     "show-archived",
+    persisted?.showArchived ?? defaultShowArchived,
     parseShowArchived,
-    false,
-    showArchivedRaw ? showArchivedRaw === "true" : undefined,
   );
 
   // Display properties
   const {
     value: displayProperties,
     setValue: setDisplayProperties,
-    valuePersisted: displayPropertiesPersisted,
-    persist: persistDisplayProperties,
     reset: resetDisplayProperties,
   } = useLinksDisplayOption<LinkDisplayProperty[]>(
     "display-properties",
+    persisted?.displayProperties ?? defaultDisplayProperties,
     parseDisplayProperties,
-    defaultDisplayProperties,
   );
 
   const isDirty = useMemo(() => {
-    if (viewMode !== parseViewMode(viewModePersisted)) return true;
-    if (sortBy !== parseSort(sortPersisted)) return true;
-    if (showArchived !== parseShowArchived(showArchivedPersisted)) return true;
+    if (viewMode !== (persisted?.viewMode ?? defaultViewMode)) return true;
+    if (sortBy !== (persisted?.sortBy ?? defaultSortBy)) return true;
+    if (showArchived !== (persisted?.showArchived ?? defaultShowArchived))
+      return true;
     if (
       displayProperties.slice().sort().join(",") !==
-      parseDisplayProperties(displayPropertiesPersisted)
+      (persisted?.displayProperties ?? defaultDisplayProperties)
         .slice()
         .sort()
         .join(",")
@@ -212,16 +215,7 @@ export function LinksDisplayProvider({ children }: PropsWithChildren) {
       return true;
 
     return false;
-  }, [
-    viewModePersisted,
-    viewMode,
-    sortPersisted,
-    sortBy,
-    showArchivedPersisted,
-    showArchived,
-    displayPropertiesPersisted,
-    displayProperties,
-  ]);
+  }, [persisted, viewMode, sortBy, showArchived, displayProperties]);
 
   return (
     <LinksDisplayContext.Provider
@@ -234,18 +228,21 @@ export function LinksDisplayProvider({ children }: PropsWithChildren) {
         setSort,
         showArchived,
         setShowArchived,
+        isLoading,
         isDirty,
         persist: () => {
-          persistViewMode();
-          persistDisplayProperties();
-          persistSort();
-          persistShowArchived();
+          setPersisted({
+            viewMode: viewMode,
+            sortBy: sortBy,
+            showArchived: showArchived,
+            displayProperties: displayProperties,
+          });
         },
         reset: () => {
           resetViewMode();
-          resetDisplayProperties();
           resetSort();
           resetShowArchived();
+          resetDisplayProperties();
         },
       }}
     >
diff --git a/packages/ui/src/hooks/use-local-storage.ts b/packages/ui/src/hooks/use-local-storage.ts
index 6fa774a7e0..3fc8423122 100644
--- a/packages/ui/src/hooks/use-local-storage.ts
+++ b/packages/ui/src/hooks/use-local-storage.ts
@@ -12,7 +12,7 @@ function getItemFromLocalStorage(key: string) {
 export function useLocalStorage<T>(
   key: string,
   initialValue: T,
-): [T, (value: T) => void] {
+): [T, (value: T) => void, { remove: () => void }] {
   const [storedValue, setStoredValue] = useState(
     getItemFromLocalStorage(key) ?? initialValue,
   );
@@ -30,5 +30,14 @@ export function useLocalStorage<T>(
     window.localStorage.setItem(key, JSON.stringify(value));
   };
 
-  return [storedValue, setValue];
+  return [
+    storedValue,
+    setValue,
+    {
+      remove: () => {
+        setStoredValue(initialValue);
+        window.localStorage.removeItem(key);
+      },
+    },
+  ];
 }