diff --git a/sdks/js/packages/core/react/components/organization/tokens/index.tsx b/sdks/js/packages/core/react/components/organization/tokens/index.tsx
index a156eec73..71b04384e 100644
--- a/sdks/js/packages/core/react/components/organization/tokens/index.tsx
+++ b/sdks/js/packages/core/react/components/organization/tokens/index.tsx
@@ -3,7 +3,7 @@ import { styles } from '../styles';
 import Skeleton from 'react-loading-skeleton';
 import tokenStyles from './token.module.css';
 import { useFrontier } from '~/react/contexts/FrontierContext';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import coin from '~/react/assets/coin.svg';
 import { AuthTooltipMessage, getFormattedNumberString } from '~/react/utils';
 import { toast } from 'sonner';
@@ -13,6 +13,7 @@ import { PlusIcon } from '@radix-ui/react-icons';
 import qs from 'query-string';
 import { DEFAULT_TOKEN_PRODUCT_NAME } from '~/react/utils/constants';
 import { useBillingPermission } from '~/react/hooks/useBillingPermission';
+import { useTokens } from '~/react/hooks/useTokens';
 
 interface TokenHeaderProps {
   billingSupportEmail?: string;
@@ -114,8 +115,6 @@ export default function Tokens() {
     isActiveOrganizationLoading,
     isBillingAccountLoading
   } = useFrontier();
-  const [tokenBalance, setTokenBalance] = useState(0);
-  const [isTokensLoading, setIsTokensLoading] = useState(false);
   const [transactionsList, setTransactionsList] = useState<
     V1Beta1BillingTransaction[]
   >([]);
@@ -124,24 +123,9 @@ export default function Tokens() {
   const [isCheckoutLoading, setIsCheckoutLoading] = useState(false);
   const { isAllowed, isFetching: isPermissionsFetching } =
     useBillingPermission();
+  const { tokenBalance, isTokensLoading } = useTokens();
 
   useEffect(() => {
-    async function getBalance(orgId: string, billingAccountId: string) {
-      try {
-        setIsTokensLoading(true);
-        const resp = await client?.frontierServiceGetBillingBalance(
-          orgId,
-          billingAccountId
-        );
-        const tokens = resp?.data?.balance?.amount || '0';
-        setTokenBalance(Number(tokens));
-      } catch (err: any) {
-        console.error(err);
-        toast.error('Unable to fetch balance');
-      } finally {
-        setIsTokensLoading(false);
-      }
-    }
     async function getTransactions(orgId: string, billingAccountId: string) {
       try {
         setIsTransactionsListLoading(true);
@@ -163,7 +147,6 @@ export default function Tokens() {
     }
 
     if (activeOrganization?.id && billingAccount?.id) {
-      getBalance(activeOrganization?.id, billingAccount?.id);
       getTransactions(activeOrganization?.id, billingAccount?.id);
     }
   }, [activeOrganization?.id, billingAccount?.id, client]);
diff --git a/sdks/js/packages/core/react/hooks/useTokens.ts b/sdks/js/packages/core/react/hooks/useTokens.ts
new file mode 100644
index 000000000..bb785a592
--- /dev/null
+++ b/sdks/js/packages/core/react/hooks/useTokens.ts
@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react';
+import { useFrontier } from '../contexts/FrontierContext';
+import { toast } from 'sonner';
+
+export const useTokens = () => {
+  const { client, activeOrganization, billingAccount } = useFrontier();
+
+  const [tokenBalance, setTokenBalance] = useState(0);
+  const [isTokensLoading, setIsTokensLoading] = useState(true);
+
+  useEffect(() => {
+    async function getBalance(orgId: string, billingAccountId: string) {
+      try {
+        setIsTokensLoading(true);
+        const resp = await client?.frontierServiceGetBillingBalance(
+          orgId,
+          billingAccountId
+        );
+        const tokens = resp?.data?.balance?.amount || '0';
+        setTokenBalance(Number(tokens));
+      } catch (err: any) {
+        console.error(err);
+        toast.error('Unable to fetch balance');
+      } finally {
+        setIsTokensLoading(false);
+      }
+    }
+
+    if (client && activeOrganization?.id && billingAccount?.id) {
+      getBalance(activeOrganization.id, billingAccount.id);
+    }
+  }, [billingAccount?.id, client, activeOrganization?.id]);
+
+  return { tokenBalance, isTokensLoading };
+};
diff --git a/sdks/js/packages/core/react/index.ts b/sdks/js/packages/core/react/index.ts
index 4b33993b5..9cedfcb4e 100644
--- a/sdks/js/packages/core/react/index.ts
+++ b/sdks/js/packages/core/react/index.ts
@@ -17,6 +17,7 @@ export { useFrontier } from './contexts/FrontierContext';
 export { FrontierProvider } from './contexts/FrontierProvider';
 
 export { Amount };
+export { useTokens } from './hooks/useTokens';
 
 export type {
   FrontierClientOptions,
diff --git a/ui/src/containers/organisations.list/billingaccounts/details.tsx b/ui/src/containers/organisations.list/billingaccounts/details.tsx
index e3b369970..5648008ce 100644
--- a/ui/src/containers/organisations.list/billingaccounts/details.tsx
+++ b/ui/src/containers/organisations.list/billingaccounts/details.tsx
@@ -123,4 +123,3 @@ export default function BillingAccountDetails() {
     </Flex>
   );
 }
-