diff --git a/src/components/common/ConnectButton.tsx b/src/components/common/ConnectButton.tsx
index 2409050c..ce71e7a3 100644
--- a/src/components/common/ConnectButton.tsx
+++ b/src/components/common/ConnectButton.tsx
@@ -2,7 +2,6 @@ import {
   useConnectModal,
   useAccountState,
   useDisconnectModal,
-  useAccountBalance,
   GeneralAccount,
 } from "@crossbell/connect-kit"
 import { useAccountSites } from "~/queries/site"
@@ -23,6 +22,7 @@ import {
   useShowNotificationModal,
   useNotifications,
 } from "@crossbell/notification"
+import { useAccountBalance } from "~/hooks/use-account-balance"
 
 export const ConnectButton: React.FC<{
   left?: boolean
diff --git a/src/hooks/use-account-balance.ts b/src/hooks/use-account-balance.ts
new file mode 100644
index 00000000..c2e79a63
--- /dev/null
+++ b/src/hooks/use-account-balance.ts
@@ -0,0 +1,22 @@
+import { useBalance } from "wagmi"
+import {
+  useAccountState,
+  useAccountBalance as _useAccountBalance,
+} from "@crossbell/connect-kit"
+
+export function useAccountBalance(): ReturnType<typeof _useAccountBalance> {
+  const account = useAccountState((s) => s.computed.account)
+  const walletBalance = useBalance({
+    address: account?.address as `0x${string}` | undefined,
+  })
+  const accountBalance = _useAccountBalance()
+
+  if (account?.type === "email") {
+    return accountBalance
+  } else {
+    return {
+      balance: walletBalance.data,
+      isLoading: walletBalance.isLoading,
+    }
+  }
+}
diff --git a/src/pages/dashboard/new-site.tsx b/src/pages/dashboard/new-site.tsx
index 4507cb01..35048675 100644
--- a/src/pages/dashboard/new-site.tsx
+++ b/src/pages/dashboard/new-site.tsx
@@ -11,7 +11,8 @@ import { BigNumber } from "ethers"
 import { UniLink } from "~/components/ui/UniLink"
 import { useAccountSites } from "~/queries/site"
 import { getSite } from "~/models/site.model"
-import { useAccountBalance, useAccountState } from "@crossbell/connect-kit"
+import { useAccountState } from "@crossbell/connect-kit"
+import { useAccountBalance } from "~/hooks/use-account-balance"
 
 export default function NewSitePage() {
   const router = useRouter()