diff --git a/src/components/pool/Pools.svelte b/src/components/pool/Pools.svelte
index 2ad0552..2f75c10 100644
--- a/src/components/pool/Pools.svelte
+++ b/src/components/pool/Pools.svelte
@@ -1,4 +1,5 @@
 <script>
+
 	import { onDestroy } from 'svelte'
 	import Button from '@components/layout/Button.svelte'
 
@@ -31,12 +32,20 @@
 
 	function setFeeAPYs(_balances) {
 		if (!_balances) return;
-		if (_balances['ETH']) feeAPY['ETH'] = 100 * 95 * 12 / _balances['ETH']; // Approx 95 ETH per month in fees
-		if (_balances['USDC']) feeAPY['USDC'] = 100 * 100000 * 12 / _balances['USDC']; // Approx 100,000 USDC per month in fees
+		// Guard: only calculate when balance is a positive number to avoid Infinity/NaN
+		if (_balances['ETH'] && _balances['ETH'] > 0) feeAPY['ETH'] = 100 * 95 * 12 / _balances['ETH'];
+		if (_balances['USDC'] && _balances['USDC'] > 0) feeAPY['USDC'] = 100 * 100000 * 12 / _balances['USDC'];
 	}
 
 	$: setFeeAPYs($poolBalances);
 
+	/** Guard against undefined/null/NaN/Infinity — returns value or fallback */
+	function safe(val, fallback = '—') {
+		if (val === null || val === undefined) return fallback;
+		if (typeof val === 'number' && (isNaN(val) || !isFinite(val))) return fallback;
+		return val;
+	}
+
 </script>
 
 <style>
@@ -66,7 +75,6 @@
 	.subtitle {
 		color: var(--text300);
 	}
-
 	.buttons {
 		display: flex;
 		gap: var(--base-padding);
@@ -162,16 +170,16 @@
 		</div>
 		<div class='table-body'>
 			{#each assets as asset}
-			<div class='row'>
-				<div class='cell la'><img src={`/asset-logos/${asset}.svg`} /> {asset}</div>
-				<div class='cell'><span>{numberWithCommas($poolBalances[asset]) || 0}<br/><span class='grayed'>${formatForDisplay(getAmountInUsd(asset, $poolBalances[asset], $prices))}</span></span></div>
-				<div class='cell'>{formatForDisplay(feeAPY[asset])}%</div>
-				<div class='cell'>30%+</div>
-				<div class='cell'>{numberWithCommas($globalUPLs[asset])}</div>
-				<div class='cell'>{numberWithCommas($bufferBalances[asset])}</div>
-				<div class='cell highlighted'><span>{numberWithCommas($poolStakes[asset]) || 0}<br><span class='grayed'>${getAmountInUsd(asset, $poolStakes[asset], $prices)}</span></span></div>
-				<div class='cell highlighted'>{$poolBalances[asset] == 0 ? 'N/A' : formatForDisplay(($poolStakes[asset])/$poolBalances[asset]  *100 )+ '%'}</div>
-			</div>
+				<div class='row'>
+					<div class='cell la'><img src={`/asset-logos/${asset}.svg`} /> {asset}</div>
+					<div class='cell'><span>{safe(numberWithCommas($poolBalances[asset]), isLoading ? '…' : '0')}<br/><span class='grayed'>{safe(formatForDisplay(getAmountInUsd(asset, $poolBalances[asset], $prices)), isLoading ? '…' : '$0')}</span></span></div>
+					<div class='cell'>{safe(feeAPY[asset]) ? formatForDisplay(safe(feeAPY[asset])) + '%' : (isLoading ? '…' : '—')}</div>
+					<div class='cell'>30%+</div>
+					<div class='cell'>{safe(numberWithCommas($globalUPLs[asset]), isLoading ? '…' : '0')}</div>
+					<div class='cell'>{safe(numberWithCommas($bufferBalances[asset]), isLoading ? '…' : '0')}</div>
+					<div class='cell highlighted'><span>{safe(numberWithCommas($poolStakes[asset]), isLoading ? '…' : '0')}<br><span class='grayed'>{safe(getAmountInUsd(asset, $poolStakes[asset], $prices), isLoading ? '…' : '$0')}</span></span></div>
+					<div class='cell highlighted'>{$poolBalances[asset] == 0 || !$poolBalances[asset] ? 'N/A' : safe(formatForDisplay(($poolStakes[asset] || 0) / $poolBalances[asset] * 100)) + '%'}</div>
+				</div>
 			{/each}
 			<div class='row'>
 				<div class='cell la'>Total</div>
@@ -185,9 +193,9 @@
 			</div>
 		</div>
 	</div>
+</div>
 
-	<div class='footnote'>
-		¹ Does not include trader wins and losses.<br/>
-		² Sum total of unrealized trader wins or losses. Updated every ~15min.
-	</div>
-</div>
\ No newline at end of file
+<div class='footnote'>
+	¹ Does not include trader wins and losses.<br/>
+	² Sum total of unrealized trader wins or losses. Updated every ~15min.
+</div>