diff --git a/apps/trading/client-pages/portfolio/account-history-container.tsx b/apps/trading/client-pages/portfolio/account-history-container.tsx
index b32fc3aa7..9a30a4735 100644
--- a/apps/trading/client-pages/portfolio/account-history-container.tsx
+++ b/apps/trading/client-pages/portfolio/account-history-container.tsx
@@ -9,7 +9,6 @@ import compact from 'lodash/compact';
 import type { ChangeEvent } from 'react';
 import { useMemo, useState } from 'react';
 import type { AccountHistoryQuery } from './__generated__/AccountHistory';
-import { useAccountsWithBalanceQuery } from './__generated__/AccountHistory';
 import { useAccountHistoryQuery } from './__generated__/AccountHistory';
 import * as Schema from '@vegaprotocol/types';
 import type { AssetFieldsFragment } from '@vegaprotocol/assets';
@@ -26,6 +25,8 @@ import {
 import { AccountTypeMapping } from '@vegaprotocol/types';
 import { PriceChart } from 'pennant';
 import 'pennant/dist/style.css';
+import { accountsOnlyDataProvider } from '@vegaprotocol/accounts';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 
 const DateRange = {
   RANGE_1D: '1D',
@@ -95,17 +96,15 @@ const AccountHistoryManager = ({
     [pubKey]
   );
 
-  const assetsWithBalanceHistory = useAccountsWithBalanceQuery({
+  const { data: assetsWithBalanceHistory } = useDataProvider({
+    dataProvider: accountsOnlyDataProvider,
     variables: variablesForOneTimeQuery,
     skip: !pubKey,
   });
 
   const assetsWithBalance = useMemo(
-    () =>
-      assetsWithBalanceHistory.data?.balanceChanges.edges.map(
-        (e) => e?.node.assetId
-      ) || [],
-    [assetsWithBalanceHistory.data?.balanceChanges.edges]
+    () => assetsWithBalanceHistory?.map((e) => e?.asset?.id) || [],
+    [assetsWithBalanceHistory]
   );
 
   const assets = useMemo(
diff --git a/libs/accounts/src/lib/accounts-data-provider.ts b/libs/accounts/src/lib/accounts-data-provider.ts
index db126049a..d990a0358 100644
--- a/libs/accounts/src/lib/accounts-data-provider.ts
+++ b/libs/accounts/src/lib/accounts-data-provider.ts
@@ -125,12 +125,10 @@ const getTotalBalance = (accounts: AccountFieldsFragment[]) =>
   accounts.reduce((acc, a) => acc + BigInt(a.balance), BigInt(0));
 
 export const getAccountData = (data: Account[]): AccountFields[] => {
-  return getAssetIds(data)
-    .map((assetId) => {
-      const accounts = data.filter((a) => a.asset.id === assetId);
-      return accounts && getAssetAccountAggregation(accounts, assetId);
-    })
-    .filter((a) => a.deposited !== '0'); // filter empty accounts
+  return getAssetIds(data).map((assetId) => {
+    const accounts = data.filter((a) => a.asset.id === assetId);
+    return accounts && getAssetAccountAggregation(accounts, assetId);
+  });
 };
 
 const getAssetAccountAggregation = (