diff --git a/src/perps-v3.ts b/src/perps-v3.ts
index b8e423c..e42ff8f 100644
--- a/src/perps-v3.ts
+++ b/src/perps-v3.ts
@@ -101,7 +101,8 @@ export function handlePositionLiquidated(event: PositionLiquidatedEvent): void {
   liquidation.timestamp = event.block.timestamp;
   liquidation.save();
 
-  let statEntity = PerpsV3Stat.load(account.owner.toHex());
+  let statId = event.params.accountId.toString() + '-' + account.owner.toHexString();
+  let statEntity = PerpsV3Stat.load(statId);
 
   if (openPosition === null) {
     log.warning('Position entity not found for positionId {}', [positionId]);
@@ -168,11 +169,13 @@ export function handleOrderSettled(event: OrderSettledEvent): void {
     return;
   }
 
-  let statEntity = PerpsV3Stat.load(account.owner.toHex());
+  let statId = event.params.accountId.toString() + '-' + account.owner.toHexString();
+  let statEntity = PerpsV3Stat.load(statId);
 
   if (statEntity == null) {
-    statEntity = new PerpsV3Stat(account.owner.toHex());
-    statEntity.account = account.owner;
+    statEntity = new PerpsV3Stat(statId);
+    statEntity.accountId = event.params.accountId;
+    statEntity.accountOwner = account.owner;
     statEntity.feesPaid = ZERO;
     statEntity.pnl = ZERO;
     statEntity.pnlWithFeesPaid = ZERO;
diff --git a/subgraphs/perps-v3.graphql b/subgraphs/perps-v3.graphql
index 8ba33db..b903c6c 100644
--- a/subgraphs/perps-v3.graphql
+++ b/subgraphs/perps-v3.graphql
@@ -160,7 +160,8 @@ type CollateralChange @entity {
 
 type PerpsV3Stat @entity {
   id: ID!
-  account: Bytes!
+  accountId: BigInt!
+  accountOwner: Bytes!
   feesPaid: BigInt!
   pnl: BigInt!
   pnlWithFeesPaid: BigInt!