diff --git a/chain/actors/builtin/power/power.go b/chain/actors/builtin/power/power.go
index e683cfd96..bafb14de0 100644
--- a/chain/actors/builtin/power/power.go
+++ b/chain/actors/builtin/power/power.go
@@ -51,6 +51,7 @@ type State interface {
 	MinerPower(address.Address) (Claim, bool, error)
 	MinerNominalPowerMeetsConsensusMinimum(address.Address) (bool, error)
 	ListAllMiners() ([]address.Address, error)
+	ForEachClaim(func(miner address.Address, claim Claim) error) error
 }
 
 type Claim struct {
diff --git a/chain/actors/builtin/power/v0.go b/chain/actors/builtin/power/v0.go
index e2a9cf382..3f9a65777 100644
--- a/chain/actors/builtin/power/v0.go
+++ b/chain/actors/builtin/power/v0.go
@@ -96,3 +96,22 @@ func (s *state0) ListAllMiners() ([]address.Address, error) {
 
 	return miners, nil
 }
+
+func (s *state0) ForEachClaim(cb func(miner address.Address, claim Claim) error) error {
+	claims, err := adt0.AsMap(s.store, s.Claims)
+	if err != nil {
+		return err
+	}
+
+	var claim power0.Claim
+	return claims.ForEach(&claim, func(k string) error {
+		a, err := address.NewFromBytes([]byte(k))
+		if err != nil {
+			return err
+		}
+		return cb(a, Claim{
+			RawBytePower:    claim.RawBytePower,
+			QualityAdjPower: claim.QualityAdjPower,
+		})
+	})
+}
diff --git a/chain/actors/builtin/power/v2.go b/chain/actors/builtin/power/v2.go
index 6346a09b6..0c15f0669 100644
--- a/chain/actors/builtin/power/v2.go
+++ b/chain/actors/builtin/power/v2.go
@@ -96,3 +96,22 @@ func (s *state2) ListAllMiners() ([]address.Address, error) {
 
 	return miners, nil
 }
+
+func (s *state2) ForEachClaim(cb func(miner address.Address, claim Claim) error) error {
+	claims, err := adt2.AsMap(s.store, s.Claims)
+	if err != nil {
+		return err
+	}
+
+	var claim power2.Claim
+	return claims.ForEach(&claim, func(k string) error {
+		a, err := address.NewFromBytes([]byte(k))
+		if err != nil {
+			return err
+		}
+		return cb(a, Claim{
+			RawBytePower:    claim.RawBytePower,
+			QualityAdjPower: claim.QualityAdjPower,
+		})
+	})
+}
diff --git a/tools/stats/metrics.go b/tools/stats/metrics.go
index aee61b2aa..795203c40 100644
--- a/tools/stats/metrics.go
+++ b/tools/stats/metrics.go
@@ -13,6 +13,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/power"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/reward"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -269,25 +270,27 @@ func RecordTipsetStatePoints(ctx context.Context, api api.FullNode, pl *PointLis
 	p = NewPoint("chain.power", totalPower.TotalPower.QualityAdjPower.Int64())
 	pl.AddPoint(p)
 
-	miners, err := api.StateListMiners(ctx, tipset.Key())
+	powerActor, err := api.StateGetActor(ctx, power.Address, tipset.Key())
 	if err != nil {
 		return err
 	}
 
-	for _, addr := range miners {
-		mp, err := api.StateMinerPower(ctx, addr, tipset.Key())
-		if err != nil {
-			return err
-		}
-
-		if !mp.MinerPower.QualityAdjPower.IsZero() {
-			p = NewPoint("chain.miner_power", mp.MinerPower.QualityAdjPower.Int64())
-			p.AddTag("miner", addr.String())
-			pl.AddPoint(p)
-		}
+	powerActorState, err := power.Load(&ApiIpldStore{ctx, api}, powerActor)
+	if err != nil {
+		return err
 	}
 
-	return nil
+	return powerActorState.ForEachClaim(func(addr address.Address, claim power.Claim) error {
+		if claim.QualityAdjPower.Int64() == 0 {
+			return nil
+		}
+
+		p = NewPoint("chain.miner_power", claim.QualityAdjPower.Int64())
+		p.AddTag("miner", addr.String())
+		pl.AddPoint(p)
+
+		return nil
+	})
 }
 
 type msgTag struct {