diff --git a/src/mappings/rewardsManager.ts b/src/mappings/rewardsManager.ts
index a83eee3..443b127 100644
--- a/src/mappings/rewardsManager.ts
+++ b/src/mappings/rewardsManager.ts
@@ -85,6 +85,7 @@ export function handleRewardsAssigned(event: RewardsAssigned): void {
   graphNetwork.totalIndexingDelegatorRewards = graphNetwork.totalIndexingDelegatorRewards.plus(
     delegatorIndexingRewards,
   )
+  graphNetwork.totalDelegatedTokens = graphNetwork.totalDelegatedTokens.plus(delegatorIndexingRewards)
   graphNetwork.save()
 }
 
diff --git a/src/mappings/staking.ts b/src/mappings/staking.ts
index ce70b65..7fff1bd 100644
--- a/src/mappings/staking.ts
+++ b/src/mappings/staking.ts
@@ -103,6 +103,7 @@ export function handleStakeLocked(event: StakeLocked): void {
   // update indexer
   let id = event.params.indexer.toHexString()
   let indexer = Indexer.load(id)!
+  let oldLockedTokens = indexer.lockedTokens
   indexer.lockedTokens = event.params.tokens
   indexer.tokensLockedUntil = event.params.until.toI32()
   indexer = updateAdvancedIndexerMetrics(indexer as Indexer)
@@ -110,9 +111,11 @@ export function handleStakeLocked(event: StakeLocked): void {
   indexer.save()
 
   // update graph network
+  // the tokens from the event replace the previously locked tokens
+  // from this indexer
   graphNetwork.totalUnstakedTokensLocked = graphNetwork.totalUnstakedTokensLocked.plus(
     event.params.tokens,
-  )
+  ).minus(oldLockedTokens)
   if (indexer.stakedTokens == indexer.lockedTokens) {
     graphNetwork.stakedIndexersCount = graphNetwork.stakedIndexersCount - 1
   }
@@ -659,6 +662,7 @@ export function handleRebateClaimed(event: RebateClaimed): void {
   graphNetwork.totalUnclaimedQueryFeeRebates = graphNetwork.totalUnclaimedQueryFeeRebates.minus(
     event.params.delegationFees.plus(event.params.tokens),
   )
+  graphNetwork.totalDelegatedTokens = graphNetwork.totalDelegatedTokens.plus(event.params.delegationFees)
   graphNetwork.save()
 }
 
@@ -742,6 +746,7 @@ export function handleRebateCollected(event: RebateCollected): void {
   graphNetwork.totalUnclaimedQueryFeeRebates = graphNetwork.totalUnclaimedQueryFeeRebates.minus(
     event.params.delegationRewards.plus(event.params.queryRebates),
   )
+  graphNetwork.totalDelegatedTokens = graphNetwork.totalDelegatedTokens.plus(event.params.delegationRewards)
   graphNetwork.save()
 }