diff --git a/src/components/guides/Demo.tsx b/src/components/guides/Demo.tsx
index a0f7c33b..ac2ebb2e 100644
--- a/src/components/guides/Demo.tsx
+++ b/src/components/guides/Demo.tsx
@@ -108,7 +108,7 @@ export function Container(
   const disconnect = useDisconnect()
   const restart = React.useCallback(() => {
     disconnect.disconnect()
-  }, [disconnect.disconnect])
+  }, [disconnect.disconnect, disconnect])
 
   const balanceAddress = React.useMemo(() => {
     if (props.footerVariant !== 'balances') return address
diff --git a/src/components/guides/steps/payments/AddFunds.tsx b/src/components/guides/steps/payments/AddFunds.tsx
index 60a8129c..736abf36 100644
--- a/src/components/guides/steps/payments/AddFunds.tsx
+++ b/src/components/guides/steps/payments/AddFunds.tsx
@@ -90,7 +90,7 @@ export function AddFunds(props: DemoStepProps) {
         {fundAccount.isPending ? 'Adding funds' : 'Add funds'}
       </Button>
     )
-  }, [address, balance, fundAccount.isPending, fundAccount.mutate, showLogin])
+  }, [address, balance, fundAccount.isPending, fundAccount.mutate, showLogin, fundAccount])
 
   return (
     <Step
diff --git a/src/components/guides/steps/payments/AddFundsToOthers.tsx b/src/components/guides/steps/payments/AddFundsToOthers.tsx
index a210add3..6980f4cf 100644
--- a/src/components/guides/steps/payments/AddFundsToOthers.tsx
+++ b/src/components/guides/steps/payments/AddFundsToOthers.tsx
@@ -104,7 +104,14 @@ export function AddFundsToOthers(props: DemoStepProps) {
         {fundAccount.isPending ? 'Adding funds' : 'Add funds'}
       </Button>
     )
-  }, [isValidTarget, balance, fundAccount.isPending, fundAccount.isSuccess, fundAccount.mutate])
+  }, [
+    isValidTarget,
+    balance,
+    fundAccount.isPending,
+    fundAccount.isSuccess,
+    fundAccount.mutate,
+    fundAccount,
+  ])
 
   return (
     <Step
diff --git a/src/components/guides/steps/wallet/AddFundsToWallet.tsx b/src/components/guides/steps/wallet/AddFundsToWallet.tsx
index 00d0b9fa..a8f8bf4a 100644
--- a/src/components/guides/steps/wallet/AddFundsToWallet.tsx
+++ b/src/components/guides/steps/wallet/AddFundsToWallet.tsx
@@ -89,7 +89,7 @@ export function AddFundsToWallet(props: DemoStepProps) {
         {fundAccount.isPending ? 'Adding funds' : 'Add funds'}
       </Button>
     )
-  }, [hasNonWebAuthnWallet, balance, fundAccount.isPending, fundAccount.mutate])
+  }, [hasNonWebAuthnWallet, balance, fundAccount.isPending, fundAccount.mutate, fundAccount])
 
   return (
     <Step
diff --git a/src/components/guides/steps/wallet/SetFeeToken.tsx b/src/components/guides/steps/wallet/SetFeeToken.tsx
index 20d57419..e7ffa936 100644
--- a/src/components/guides/steps/wallet/SetFeeToken.tsx
+++ b/src/components/guides/steps/wallet/SetFeeToken.tsx
@@ -105,7 +105,15 @@ export function SetFeeToken(props: DemoStepProps) {
         },
       },
     )
-  }, [address, isFeeTokenValid, resolvedFeeToken, setUserToken, defaultChainId, userToken.refetch])
+  }, [
+    address,
+    isFeeTokenValid,
+    resolvedFeeToken,
+    setUserToken,
+    defaultChainId,
+    userToken.refetch,
+    userToken,
+  ])
 
   // Sync selected option with current user token
   React.useEffect(() => {