diff --git a/storage/commitment/tracker.go b/storage/commitment/tracker.go
index 59a037ffc..7cca1780d 100644
--- a/storage/commitment/tracker.go
+++ b/storage/commitment/tracker.go
@@ -13,7 +13,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-lotus/chain/address"
-	"github.com/filecoin-project/go-lotus/chain/types"
 	"github.com/filecoin-project/go-lotus/node/modules/dtypes"
 )
 
@@ -48,9 +47,8 @@ func commitmentKey(miner address.Address, sectorId uint64) datastore.Key {
 	return commitmentDsPrefix.ChildString(miner.String()).ChildString(fmt.Sprintf("%d", sectorId))
 }
 
-func (ct *Tracker) TrackCommitSectorMsg(sectorId uint64, smsg *types.SignedMessage) error {
-	mcid := smsg.Cid()
-	key := commitmentKey(smsg.Message.From, sectorId)
+func (ct *Tracker) TrackCommitSectorMsg(miner address.Address, sectorId uint64, mcid cid.Cid) error {
+	key := commitmentKey(miner, sectorId)
 
 	ct.lk.Lock()
 	defer ct.lk.Unlock()
@@ -67,10 +65,10 @@ func (ct *Tracker) TrackCommitSectorMsg(sectorId uint64, smsg *types.SignedMessa
 		}
 
 		if !comm.Msg.Equals(mcid) {
-			return xerrors.Errorf("commitment tracking for miner %s, sector %d: already tracking %s, got another commitment message: %s", smsg.Message.From, sectorId, comm.Msg, mcid)
+			return xerrors.Errorf("commitment tracking for miner %s, sector %d: already tracking %s, got another commitment message: %s", miner, sectorId, comm.Msg, mcid)
 		}
 
-		log.Warnf("commitment.TrackCommitSectorMsg called more than once for miner %s, sector %d, message %s", smsg.Message.From, sectorId, mcid)
+		log.Warnf("commitment.TrackCommitSectorMsg called more than once for miner %s, sector %d, message %s", miner, sectorId, mcid)
 		return nil
 	}
 
diff --git a/storage/miner.go b/storage/miner.go
index 663387673..9b4ff0ef2 100644
--- a/storage/miner.go
+++ b/storage/miner.go
@@ -162,7 +162,7 @@ func (m *Miner) commitSector(ctx context.Context, sinfo sectorbuilder.SectorSeal
 		return errors.Wrap(err, "pushing commit sector message to mpool")
 	}
 
-	if err := m.commt.TrackCommitSectorMsg(sinfo.SectorID, smsg); err != nil {
+	if err := m.commt.TrackCommitSectorMsg(m.maddr, sinfo.SectorID, smsg.Cid()); err != nil {
 		return errors.Wrap(err, "tracking sector commitment")
 	}