From 9d6e47ca886731d172ce0b5bd76e724cd047fa83 Mon Sep 17 00:00:00 2001
From: Fraol Lemecha <fraol0912@gmail.com>
Date: Mon, 15 Sep 2025 18:19:26 +0300
Subject: [PATCH] fix: make sure fetch function doesn't get called repeatedly
 on `onMount` (#4669)

---
 packages/better-auth/src/client/query.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/better-auth/src/client/query.ts b/packages/better-auth/src/client/query.ts
index aaf097b44f..7e12bc6977 100644
--- a/packages/better-auth/src/client/query.ts
+++ b/packages/better-auth/src/client/query.ts
@@ -118,13 +118,16 @@ export const useAuthQuery = <T>(
 				fn();
 			} else {
 				onMount(value, () => {
-					setTimeout(() => {
-						fn();
+					const timeoutId = setTimeout(() => {
+						if (!isMounted) {
+							fn();
+							isMounted = true;
+						}
 					}, 0);
-					isMounted = true;
 					return () => {
 						value.off();
 						initAtom.off();
+						clearTimeout(timeoutId);
 					};
 				});
 			}