From 34b5e0bf07ef6f193ffae1796b28f9a7a8d11888 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Mon, 15 Dec 2025 22:42:08 +0800
Subject: [PATCH] Fix deleting a user shows User not found toast error (#41339)

---
 apps/studio/components/interfaces/Auth/Users/UsersV2.tsx | 2 +-
 apps/studio/data/auth/user-delete-mutation.ts            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx
index 1b6d7acc4b4..d0c910b52d9 100644
--- a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx
@@ -236,8 +236,8 @@ export const UsersV2 = () => {
 
   const { setValue: setSelectedUser, value: selectedUser } = useQueryStateWithSelect({
     urlKey: 'show',
+    enabled: users.length > 0 && isSuccess,
     select: (id: string) => (id ? users?.find((u) => u.id === id)?.id : undefined),
-    enabled: !!users && !isLoading,
     onError: () => toast.error(`User not found`),
   })
 
diff --git a/apps/studio/data/auth/user-delete-mutation.ts b/apps/studio/data/auth/user-delete-mutation.ts
index 17e0d9bd482..c898da043ea 100644
--- a/apps/studio/data/auth/user-delete-mutation.ts
+++ b/apps/studio/data/auth/user-delete-mutation.ts
@@ -36,13 +36,13 @@ export const useUserDeleteMutation = ({
     async onSuccess(data, variables, context) {
       const { projectRef, skipInvalidation = false } = variables
 
+      await onSuccess?.(data, variables, context)
+
       if (!skipInvalidation) {
         await Promise.all([
           queryClient.invalidateQueries({ queryKey: authKeys.usersInfinite(projectRef) }),
         ])
       }
-
-      await onSuccess?.(data, variables, context)
     },
     async onError(data, variables, context) {
       if (onError === undefined) {