diff --git a/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useCreateMailDomainAccess.tsx b/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useCreateMailDomainAccess.tsx
index 4c2ec4a..296be44 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useCreateMailDomainAccess.tsx
+++ b/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useCreateMailDomainAccess.tsx
@@ -48,15 +48,15 @@ export const useCreateMailDomainAccess = (
   return useMutation<Access, APIError, CreateMailDomainAccessProps>({
     mutationFn: createMailDomainAccess,
     ...options,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [KEY_LIST_MAIL_DOMAIN_ACCESSES],
       });
       void queryClient.invalidateQueries({ queryKey: [KEY_MAIL_DOMAIN] });
-      options?.onSuccess?.(data, variables, context);
+      options?.onSuccess?.(data, variables, onMutateResult, context);
     },
-    onError: (error, variables, context) => {
-      options?.onError?.(error, variables, context);
+    onError: (error, variables, onMutateResult, context) => {
+      options?.onError?.(error, variables, onMutateResult, context);
     },
   });
 };
diff --git a/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useDeleteMailDomainAccess.tsx b/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useDeleteMailDomainAccess.tsx
index 46f3743..fec839c 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useDeleteMailDomainAccess.tsx
+++ b/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useDeleteMailDomainAccess.tsx
@@ -49,7 +49,7 @@ export const useDeleteMailDomainAccess = (
   return useMutation<void, APIError, DeleteMailDomainAccessProps>({
     mutationFn: deleteMailDomainAccess,
     ...options,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [KEY_LIST_MAIL_DOMAIN_ACCESSES],
       });
@@ -60,12 +60,12 @@ export const useDeleteMailDomainAccess = (
         queryKey: [KEY_LIST_MAIL_DOMAIN],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });
diff --git a/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useUpdateMailDomainAccess.ts b/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useUpdateMailDomainAccess.ts
index 92712e3..73e7b33 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useUpdateMailDomainAccess.ts
+++ b/src/frontend/apps/desk/src/features/mail-domains/access-management/api/useUpdateMailDomainAccess.ts
@@ -54,7 +54,7 @@ export const useUpdateMailDomainAccess = (
   return useMutation<Access, APIError, UpdateMailDomainAccessProps>({
     mutationFn: updateMailDomainAccess,
     ...options,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [KEY_LIST_MAIL_DOMAIN_ACCESSES],
       });
@@ -62,12 +62,12 @@ export const useUpdateMailDomainAccess = (
         queryKey: [KEY_MAIL_DOMAIN],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });
diff --git a/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useCreateMailbox.tsx b/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useCreateMailbox.tsx
index cea8c0d..57cb277 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useCreateMailbox.tsx
+++ b/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useCreateMailbox.tsx
@@ -46,7 +46,7 @@ export const useCreateMailbox = (options: UseCreateMailboxParams) => {
   const queryClient = useQueryClient();
   return useMutation<void, APIError, CreateMailboxParams>({
     mutationFn: createMailbox,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [
           KEY_LIST_MAILBOX,
@@ -54,12 +54,12 @@ export const useCreateMailbox = (options: UseCreateMailboxParams) => {
         ],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });
diff --git a/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useUpdateMailbox.tsx b/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useUpdateMailbox.tsx
index d259f02..b334c01 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useUpdateMailbox.tsx
+++ b/src/frontend/apps/desk/src/features/mail-domains/mailboxes/api/useUpdateMailbox.tsx
@@ -49,7 +49,7 @@ export const useUpdateMailbox = (options: UseUpdateMailboxParams) => {
   return useMutation<void, APIError, UpdateMailboxParams>({
     mutationFn: (data) =>
       updateMailbox({ ...data, mailboxId: options.mailboxId }),
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [
           KEY_LIST_MAILBOX,
@@ -57,12 +57,12 @@ export const useUpdateMailbox = (options: UseUpdateMailboxParams) => {
         ],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });
diff --git a/src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts b/src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts
index 16870a8..808e3b8 100644
--- a/src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts
+++ b/src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts
@@ -41,7 +41,7 @@ export const useDeleteTeamAccess = (options?: UseDeleteTeamAccessOptions) => {
   return useMutation<void, APIError, DeleteTeamAccessProps>({
     mutationFn: deleteTeamAccess,
     ...options,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [KEY_LIST_TEAM_ACCESSES],
       });
@@ -52,12 +52,12 @@ export const useDeleteTeamAccess = (options?: UseDeleteTeamAccessOptions) => {
         queryKey: [KEY_LIST_TEAM],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });
diff --git a/src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts b/src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts
index 7b86e3c..8657451 100644
--- a/src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts
+++ b/src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts
@@ -49,7 +49,7 @@ export const useUpdateTeamAccess = (options?: UseUpdateTeamAccessOptions) => {
   return useMutation<Access, APIError, UpdateTeamAccessProps>({
     mutationFn: updateTeamAccess,
     ...options,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [KEY_LIST_TEAM_ACCESSES],
       });
@@ -57,12 +57,12 @@ export const useUpdateTeamAccess = (options?: UseUpdateTeamAccessOptions) => {
         queryKey: [KEY_TEAM],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/api/useRemoveTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useRemoveTeam.tsx
index 8e78c54..8e6ccab 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/api/useRemoveTeam.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/api/useRemoveTeam.tsx
@@ -34,17 +34,17 @@ export const useRemoveTeam = (options?: UseRemoveTeamOptions) => {
   return useMutation<void, APIError, RemoveTeamProps>({
     mutationFn: removeTeam,
     ...options,
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       void queryClient.invalidateQueries({
         queryKey: [KEY_LIST_TEAM],
       });
       if (options?.onSuccess) {
-        options.onSuccess(data, variables, context);
+        options.onSuccess(data, variables, onMutateResult, context);
       }
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (options?.onError) {
-        options.onError(error, variables, context);
+        options.onError(error, variables, onMutateResult, context);
       }
     },
   });