diff --git a/apps/trading/components/rewards-container/Rewards.graphql b/apps/trading/components/rewards-container/Rewards.graphql
index dfc600228..8b6ec0b39 100644
--- a/apps/trading/components/rewards-container/Rewards.graphql
+++ b/apps/trading/components/rewards-container/Rewards.graphql
@@ -15,6 +15,24 @@ query RewardsPage(
       tradedVolume
       openVolume
     }
+    vestingBalancesSummary {
+      epoch
+      vestingBalances {
+        asset {
+          id
+          symbol
+        }
+        balance
+      }
+      lockedBalances {
+        asset {
+          id
+          symbol
+        }
+        balance
+        untilEpoch
+      }
+    }
   }
   epochRewardSummaries(
     filter: $epochRewardSummariesFilter
diff --git a/apps/trading/components/rewards-container/__generated__/Rewards.ts b/apps/trading/components/rewards-container/__generated__/Rewards.ts
index f5a51bbd6..e0e50e7e3 100644
--- a/apps/trading/components/rewards-container/__generated__/Rewards.ts
+++ b/apps/trading/components/rewards-container/__generated__/Rewards.ts
@@ -10,7 +10,7 @@ export type RewardsPageQueryVariables = Types.Exact<{
 }>;
 
 
-export type RewardsPageQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, activityStreak?: { __typename?: 'PartyActivityStreak', isActive: boolean, activeFor: number, inactiveFor: number, rewardDistributionMultiplier: string, rewardVestingMultiplier: string, epoch: number, tradedVolume: string, openVolume: string } | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
+export type RewardsPageQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, activityStreak?: { __typename?: 'PartyActivityStreak', isActive: boolean, activeFor: number, inactiveFor: number, rewardDistributionMultiplier: string, rewardVestingMultiplier: string, epoch: number, tradedVolume: string, openVolume: string } | null, vestingBalancesSummary: { __typename?: 'PartyVestingBalancesSummary', epoch?: number | null, vestingBalances?: Array<{ __typename?: 'PartyVestingBalance', balance: string, asset: { __typename?: 'Asset', id: string, symbol: string } }> | null, lockedBalances?: Array<{ __typename?: 'PartyLockedBalance', balance: string, untilEpoch: number, asset: { __typename?: 'Asset', id: string, symbol: string } }> | null } } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
 
 export type RewardsPageEpochQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
@@ -32,6 +32,24 @@ export const RewardsPageDocument = gql`
       tradedVolume
       openVolume
     }
+    vestingBalancesSummary {
+      epoch
+      vestingBalances {
+        asset {
+          id
+          symbol
+        }
+        balance
+      }
+      lockedBalances {
+        asset {
+          id
+          symbol
+        }
+        balance
+        untilEpoch
+      }
+    }
   }
   epochRewardSummaries(
     filter: $epochRewardSummariesFilter
diff --git a/apps/trading/components/rewards-container/rewards-container.tsx b/apps/trading/components/rewards-container/rewards-container.tsx
index dd0cbae73..411f36edf 100644
--- a/apps/trading/components/rewards-container/rewards-container.tsx
+++ b/apps/trading/components/rewards-container/rewards-container.tsx
@@ -41,17 +41,13 @@ import {
 import { formatPercentage } from '../fees-container/utils';
 import { AgGrid, StackedCell } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
+import type { ValueFormatterFunc} from 'ag-grid-community';
 import { type ColDef } from 'ag-grid-community';
 import {
   addDecimalsFormatNumberQuantum,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 
-const REWARD_ACCOUNT_TYPES = [
-  AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-  AccountType.ACCOUNT_TYPE_VESTING_REWARDS,
-];
-
 export const RewardsContainer = () => {
   const { pubKey } = useVegaWallet();
   const { params, loading: paramsLoading } = useNetworkParams([
@@ -89,7 +85,11 @@ export const RewardsContainer = () => {
           className="lg:col-span-2"
           loading={loading}
         >
-          <RewardPot accounts={accounts} rewardAssetId={params.reward_asset} />
+          <VegaRewardPot
+            accounts={accounts}
+            rewardAssetId={params.reward_asset}
+            summary={rewardsData?.party?.vestingBalancesSummary}
+          />
         </Card>
         <Card title={t('Vesting')} className="lg:col-span-2" loading={loading}>
           <Vesting baseRate={params.rewards_vesting_baseRate} />
@@ -120,93 +120,89 @@ export const RewardsContainer = () => {
   );
 };
 
-export const RewardPot = ({
+export const VegaRewardPot = ({
   accounts,
   rewardAssetId,
+  summary,
 }: {
   accounts: Account[] | null;
   rewardAssetId: string; // VEGA
+  summary:
+    | {
+        epoch: number | null | undefined;
+        vestingBalances:
+          | Array<{ asset: { id: string; symbol: string }; balance: string }>
+          | null
+          | undefined;
+        lockedBalances:
+          | Array<{
+              asset: { id: string; symbol: string };
+              balance: string;
+              untilEpoch: number;
+            }>
+          | null
+          | undefined;
+      }
+    | undefined;
 }) => {
-  const rewardAccounts = accounts
-    ? accounts.filter((a) => REWARD_ACCOUNT_TYPES.includes(a.type))
-    : [];
-
-  const totalRewards = BigNumber.sum.apply(
-    null,
-    rewardAccounts.length
-      ? rewardAccounts.map((a) => getQuantumValue(a.balance, a.asset.quantum))
-      : [0]
-  );
-
-  const rewardAssetAccounts = accounts
+  const availableRewardAssetAccounts = accounts
     ? accounts.filter((a) => {
-        return a.asset.id === rewardAssetId;
+        return (
+          a.asset.id === rewardAssetId &&
+          a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
+        );
       })
     : [];
 
-  const vestedRewardAssetAccounts = rewardAssetAccounts.filter(
-    (a) => a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
-  );
-
-  const vestingRewardAssetAccounts = rewardAssetAccounts.filter(
-    (a) => a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
-  );
-
+  // Total available to withdraw
   const totalVestedRewardsByRewardAsset = BigNumber.sum.apply(
     null,
-    vestedRewardAssetAccounts.length
-      ? vestedRewardAssetAccounts.map((a) => a.balance)
+    availableRewardAssetAccounts.length
+      ? availableRewardAssetAccounts.map((a) => a.balance)
       : [0]
   );
 
-  const totalVestingRewardsByRewardAsset = BigNumber.sum.apply(
-    null,
-    vestingRewardAssetAccounts.length
-      ? vestingRewardAssetAccounts.map((a) => a.balance)
-      : [0]
+  const lockedEntries = summary?.lockedBalances?.filter(
+    (b) => b.asset.id === rewardAssetId
   );
+  const lockedBalances = lockedEntries?.length
+    ? lockedEntries.map((e) => e.balance)
+    : [0];
+  const totalLocked = BigNumber.sum.apply(null, lockedBalances);
 
-  const totalRewardAsset = totalVestedRewardsByRewardAsset.plus(
-    totalVestingRewardsByRewardAsset
+  const vestingEntries = summary?.vestingBalances?.filter(
+    (b) => b.asset.id === rewardAssetId
   );
+  const vestingBalances = vestingEntries?.length
+    ? vestingEntries.map((e) => e.balance)
+    : [0];
+  const totalVesting = BigNumber.sum.apply(null, vestingBalances);
+
+  const totalRewards = totalLocked.plus(totalVesting);
 
   return (
     <div className="pt-4">
-      <div className="flex justify-between">
-        <CardStat
-          value={
-            <span data-testid="total-rewards">
-              {totalRewardAsset.toString()} {t('VEGA')}
-            </span>
-          }
-        />
-        <CardStat
-          value={
-            <span data-testid="total-rewards">
-              {totalRewards.toString()}{' '}
-              <span className="calt">{t('qUSD')}</span>
-            </span>
-          }
-        />
-      </div>
+      <CardStat
+        value={
+          <span data-testid="total-rewards">
+            {totalRewards.toString()} {t('VEGA')}
+          </span>
+        }
+      />
       <div className="flex flex-col gap-4">
         <CardTable>
           <tr>
             <CardTableTH>
               <span className="flex items-center gap-1">
-                {t('Vesting VEGA')}
+                {t('Locked VEGA')}
                 <VegaIcon name={VegaIconNames.LOCK} size={12} />
               </span>
             </CardTableTH>
-            <CardTableTD>
-              {totalVestingRewardsByRewardAsset.toString()}
-            </CardTableTD>
+            <CardTableTD>{totalLocked.toString()}</CardTableTD>
           </tr>
           <tr>
-            <CardTableTH>{t('Vested VEGA')}</CardTableTH>
-            <CardTableTD>
-              {totalVestedRewardsByRewardAsset.toString()}
-            </CardTableTD>
+            <CardTableTH>{t('Vesting VEGA')}</CardTableTH>
+            <CardTableTD>{totalVesting.toString()}</CardTableTD>
           </tr>
           <tr>
             <CardTableTH>{t('Available to withdraw this epoch')}</CardTableTH>
@@ -352,13 +348,13 @@ const RewardHistory = ({
   });
 
   const columnDefs = useMemo<ColDef<RewardRow>[]>(() => {
-    const rewardValueFormatter = ({
+    const rewardValueFormatter: ValueFormatterFunc<RewardRow> = ({
       data,
       value,
-    }: {
-      data: RewardRow;
-      value: number;
     }) => {
+      if (!value || !data) {
+        return '-';
+      }
       return addDecimalsFormatNumberQuantum(
         value,
         data.asset.decimals,
@@ -375,7 +371,7 @@ const RewardHistory = ({
       value: number;
       valueFormatted: string;
     }) => {
-      if (value <= 0) {
+      if (!value || value <= 0 || !data) {
         return <span className="text-muted">-</span>;
       }