diff --git a/apps/trading/components/fees-container/fees-container.tsx b/apps/trading/components/fees-container/fees-container.tsx
index 229524be1..5284121a0 100644
--- a/apps/trading/components/fees-container/fees-container.tsx
+++ b/apps/trading/components/fees-container/fees-container.tsx
@@ -1,5 +1,4 @@
 import type { ReactNode } from 'react';
-import compact from 'lodash/compact';
 import maxBy from 'lodash/maxBy';
 import minBy from 'lodash/minBy';
 import classNames from 'classnames';
@@ -14,8 +13,10 @@ import {
 import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import { useMarketList } from '@vegaprotocol/markets';
 import { MarketFees } from './market-fees';
-import { format, getReferralBenefitTier, getVolumeTier } from './utils';
+import { format } from './utils';
 import { Table, Td, Th, THead } from './table';
+import { useVolumeStats } from './use-volume-stats';
+import { useReferralStats } from './use-referral-stats';
 
 /**
  * TODO:
@@ -44,6 +45,25 @@ export const FeesContainer = () => {
   });
   const { data: markets } = useMarketList();
 
+  const { volumeDiscount, volumeTierIndex, volumeLastEpoch, volumeTiers } =
+    useVolumeStats(
+      data?.volumeDiscountStats,
+      data?.currentVolumeDiscountProgram
+    );
+
+  const {
+    referralDiscount,
+    referralVolume,
+    referralTierIndex,
+    referralTiers,
+    epochsInSet,
+  } = useReferralStats(
+    data?.referralSetStats,
+    data?.referralSetReferees,
+    data?.currentReferralProgram,
+    data?.epoch
+  );
+
   if (!pubKey) {
     return <p>Please connect wallet</p>;
   }
@@ -57,52 +77,6 @@ export const FeesContainer = () => {
     return <p>Loading...</p>;
   }
 
-  // Referral data
-  const referralSetsStats = compact(data.referralSetStats.edges).map(
-    (e) => e.node
-  );
-  const referralSets = compact(data.referralSetReferees.edges).map(
-    (e) => e.node
-  );
-
-  if (referralSets.length > 1 || referralSetsStats.length > 1) {
-    throw new Error('more than one referral set for user');
-  }
-
-  const referralSet = referralSets[0];
-  const referralStats = referralSetsStats[0];
-
-  const epochsInSet = Number(data.epoch.id) - referralSet.atEpoch;
-  const referralDiscount = Number(referralStats.discountFactor || 0);
-
-  const referralTiers = data.currentReferralProgram?.benefitTiers.length
-    ? [...data.currentReferralProgram.benefitTiers].reverse()
-    : [];
-
-  const referralTierIndex = getReferralBenefitTier(
-    epochsInSet,
-    Number(referralStats.referralSetRunningNotionalTakerVolume),
-    referralTiers
-  );
-
-  // Volume data
-  const volumeStats = compact(data.volumeDiscountStats.edges).map(
-    (e) => e.node
-  );
-
-  const volumeDiscount = Number(volumeStats[0].discountFactor || 0);
-
-  const lastEpochVolumeStats = data.volumeDiscountStats
-    ? maxBy(volumeStats, (s) => s.atEpoch)
-    : undefined;
-  const lastEpochVolume = Number(lastEpochVolumeStats?.runningVolume || 0);
-
-  const volumeTiers = data.currentVolumeDiscountProgram?.benefitTiers.length
-    ? [...data.currentVolumeDiscountProgram.benefitTiers].reverse()
-    : [];
-
-  const volumeTierIndex = getVolumeTier(lastEpochVolume, volumeTiers);
-
   return (
     <div className="p-3">
       <h1 className="px-4 pt-2 pb-4 text-2xl">{t('Fees')}</h1>
@@ -118,16 +92,14 @@ export const FeesContainer = () => {
         </FeeCard>
         <FeeCard title={t('My current volume')}>
           <CurrentVolume
-            volumeProgram={data.currentVolumeDiscountProgram}
-            lastEpochVolume={lastEpochVolume}
+            tiers={volumeTiers}
             tierIndex={volumeTierIndex}
+            lastEpochVolume={volumeLastEpoch}
           />
         </FeeCard>
         <FeeCard title={t('Referral benefits')}>
           <ReferralBenefits
-            setRunningNotionalTakerVolume={Number(
-              referralStats.referralSetRunningNotionalTakerVolume
-            )}
+            setRunningNotionalTakerVolume={referralVolume}
             epochsInSet={epochsInSet}
           />
         </FeeCard>
@@ -135,7 +107,7 @@ export const FeesContainer = () => {
           <VolumeTiers
             tiers={volumeTiers}
             tierIndex={volumeTierIndex}
-            lastEpochVolume={lastEpochVolume}
+            lastEpochVolume={volumeLastEpoch}
           />
         </FeeCard>
         <FeeCard title={t('Referral discount')} className="lg:col-span-2">
@@ -241,11 +213,11 @@ const TradingFees = ({
 };
 
 const CurrentVolume = ({
-  volumeProgram,
+  tiers,
   tierIndex,
   lastEpochVolume,
 }: {
-  volumeProgram?: FeesQuery['currentVolumeDiscountProgram'];
+  tiers?: Array<{ minimumRunningNotionalTakerVolume: string }>;
   tierIndex: number;
   lastEpochVolume: number;
 }) => {
@@ -260,8 +232,8 @@ const CurrentVolume = ({
 
   let requiredForNextTier = 0;
 
-  if (tierIndex) {
-    const nextTier = volumeProgram?.benefitTiers[tierIndex + 1];
+  if (tiers && tierIndex) {
+    const nextTier = tiers[tierIndex - 1];
     requiredForNextTier = nextTier
       ? Number(nextTier.minimumRunningNotionalTakerVolume) - lastEpochVolume
       : 0;
diff --git a/apps/trading/components/fees-container/use-referral-stats.ts b/apps/trading/components/fees-container/use-referral-stats.ts
new file mode 100644
index 000000000..96e930f24
--- /dev/null
+++ b/apps/trading/components/fees-container/use-referral-stats.ts
@@ -0,0 +1,53 @@
+import compact from 'lodash/compact';
+import { getReferralBenefitTier } from './utils';
+import type { FeesQuery } from './__generated__/Fees';
+
+export const useReferralStats = (
+  setStats?: FeesQuery['referralSetStats'],
+  setReferees?: FeesQuery['referralSetReferees'],
+  program?: FeesQuery['currentReferralProgram'],
+  epoch?: FeesQuery['epoch']
+) => {
+  if (!setStats || !setReferees || !program || !epoch) {
+    return {
+      referralDiscount: 0,
+      referralVolume: 0,
+      referralTierIndex: -1,
+      referralTiers: [],
+      epochsInSet: 0,
+    };
+  }
+
+  const referralSetsStats = compact(setStats.edges).map((e) => e.node);
+  const referralSets = compact(setReferees.edges).map((e) => e.node);
+
+  if (referralSets.length > 1 || referralSetsStats.length > 1) {
+    throw new Error('more than one referral set for user');
+  }
+
+  const referralSet = referralSets[0];
+  const referralStats = referralSetsStats[0];
+
+  const epochsInSet = Number(epoch.id) - referralSet.atEpoch;
+  const referralDiscount = Number(referralStats.discountFactor || 0);
+
+  const referralTiers = [...program.benefitTiers].reverse();
+
+  const referralTierIndex = getReferralBenefitTier(
+    epochsInSet,
+    Number(referralStats.referralSetRunningNotionalTakerVolume),
+    referralTiers
+  );
+
+  const referralVolume = Number(
+    referralStats.referralSetRunningNotionalTakerVolume
+  );
+
+  return {
+    referralDiscount,
+    referralVolume,
+    referralTierIndex,
+    referralTiers,
+    epochsInSet,
+  };
+};
diff --git a/apps/trading/components/fees-container/use-volume-stats.ts b/apps/trading/components/fees-container/use-volume-stats.ts
new file mode 100644
index 000000000..5dcb061af
--- /dev/null
+++ b/apps/trading/components/fees-container/use-volume-stats.ts
@@ -0,0 +1,39 @@
+import compact from 'lodash/compact';
+import maxBy from 'lodash/maxBy';
+import { getVolumeTier } from './utils';
+import type { FeesQuery } from './__generated__/Fees';
+
+export const useVolumeStats = (
+  stats?: FeesQuery['volumeDiscountStats'],
+  program?: FeesQuery['currentVolumeDiscountProgram']
+) => {
+  if (!stats || !program) {
+    return {
+      volumeDiscount: 0,
+      volumeTierIndex: -1,
+      volumeLastEpoch: 0,
+      volumeTiers: [],
+    };
+  }
+
+  const volumeStats = compact(stats.edges).map((e) => e.node);
+
+  const volumeDiscount = Number(volumeStats[0].discountFactor || 0);
+
+  const lastEpochVolumeStats = stats
+    ? maxBy(volumeStats, (s) => s.atEpoch)
+    : undefined;
+
+  const volumeLastEpoch = Number(lastEpochVolumeStats?.runningVolume || 0);
+
+  const volumeTiers = [...program.benefitTiers].reverse();
+
+  const volumeTierIndex = getVolumeTier(volumeLastEpoch, volumeTiers);
+
+  return {
+    volumeDiscount,
+    volumeTierIndex,
+    volumeLastEpoch,
+    volumeTiers,
+  };
+};