diff --git a/packages/desktop-client/src/hooks/useGlobalPref.ts b/packages/desktop-client/src/hooks/useGlobalPref.ts
index 2ec15b5c2a..7289693f0f 100644
--- a/packages/desktop-client/src/hooks/useGlobalPref.ts
+++ b/packages/desktop-client/src/hooks/useGlobalPref.ts
@@ -12,9 +12,9 @@ export function useGlobalPref<K extends keyof GlobalPrefs>(
   prefName: K,
   onSaveGlobalPrefs?: () => void,
 ): [GlobalPrefs[K], SetGlobalPrefAction<K>] {
-  const saveGlobalPrefsMutation = useSaveGlobalPrefsMutation();
+  const { mutate: saveGlobalPrefs } = useSaveGlobalPrefsMutation();
   const saveGlobalPref: SetGlobalPrefAction<K> = value => {
-    saveGlobalPrefsMutation.mutate(
+    saveGlobalPrefs(
       {
         [prefName]: value,
       },
@@ -24,12 +24,12 @@ export function useGlobalPref<K extends keyof GlobalPrefs>(
     );
   };
 
-  const globalPrefsQuery = useQuery({
+  const { data: globalPref } = useQuery({
     ...prefQueries.listGlobal(),
     select: prefs => prefs?.[prefName],
     enabled: !!prefName,
     notifyOnChangeProps: ['data'],
   });
 
-  return [globalPrefsQuery.data as GlobalPrefs[K], saveGlobalPref];
+  return [globalPref as GlobalPrefs[K], saveGlobalPref];
 }
diff --git a/packages/desktop-client/src/hooks/useMetadataPref.ts b/packages/desktop-client/src/hooks/useMetadataPref.ts
index 7122efb7cc..6818e2cfdf 100644
--- a/packages/desktop-client/src/hooks/useMetadataPref.ts
+++ b/packages/desktop-client/src/hooks/useMetadataPref.ts
@@ -14,17 +14,17 @@ type SetMetadataPrefAction<K extends keyof MetadataPrefs> = (
 export function useMetadataPref<K extends keyof MetadataPrefs>(
   prefName: K,
 ): [MetadataPrefs[K], SetMetadataPrefAction<K>] {
-  const saveMetadataPrefMutation = useSaveMetadataPrefsMutation();
+  const { mutate: saveMetadataPrefs } = useSaveMetadataPrefsMutation();
   const saveMetadataPref: SetMetadataPrefAction<K> = value => {
-    saveMetadataPrefMutation.mutate({ [prefName]: value });
+    saveMetadataPrefs({ [prefName]: value });
   };
 
-  const metadataPrefsQuery = useQuery({
+  const { data: metadataPref } = useQuery({
     ...prefQueries.listMetadata(),
     select: prefs => prefs?.[prefName],
     enabled: !!prefName,
     notifyOnChangeProps: ['data'],
   });
 
-  return [metadataPrefsQuery.data as MetadataPrefs[K], saveMetadataPref];
+  return [metadataPref as MetadataPrefs[K], saveMetadataPref];
 }
diff --git a/packages/desktop-client/src/hooks/useSyncedPref.ts b/packages/desktop-client/src/hooks/useSyncedPref.ts
index d90dd21485..908680eef8 100644
--- a/packages/desktop-client/src/hooks/useSyncedPref.ts
+++ b/packages/desktop-client/src/hooks/useSyncedPref.ts
@@ -11,17 +11,17 @@ type SetSyncedPrefAction<K extends keyof SyncedPrefs> = (
 export function useSyncedPref<K extends keyof SyncedPrefs>(
   prefName: K,
 ): [SyncedPrefs[K], SetSyncedPrefAction<K>] {
-  const saveSyncedPrefsMutation = useSaveSyncedPrefsMutation();
+  const { mutate: saveSyncedPrefs } = useSaveSyncedPrefsMutation();
   const saveSyncedPref: SetSyncedPrefAction<K> = value => {
-    saveSyncedPrefsMutation.mutate({ [prefName]: value });
+    saveSyncedPrefs({ [prefName]: value });
   };
 
-  const syncedPrefsQuery = useQuery({
+  const { data: syncedPref } = useQuery({
     ...prefQueries.listSynced(),
     select: prefs => prefs?.[prefName],
     enabled: !!prefName,
     notifyOnChangeProps: ['data'],
   });
 
-  return [syncedPrefsQuery.data as SyncedPrefs[K], saveSyncedPref];
+  return [syncedPref as SyncedPrefs[K], saveSyncedPref];
 }