diff --git a/chain/types/tipset_key.go b/chain/types/tipset_key.go
index e5bc7750d..9f9887796 100644
--- a/chain/types/tipset_key.go
+++ b/chain/types/tipset_key.go
@@ -47,7 +47,7 @@ func NewTipSetKey(cids ...cid.Cid) TipSetKey {
 func TipSetKeyFromBytes(encoded []byte) (TipSetKey, error) {
 	_, err := decodeKey(encoded)
 	if err != nil {
-		return TipSetKey{}, err
+		return EmptyTSK, err
 	}
 	return TipSetKey{string(encoded)}, nil
 }
diff --git a/chain/types/tipset_key_test.go b/chain/types/tipset_key_test.go
index 7b3ce439d..73c1ca9df 100644
--- a/chain/types/tipset_key_test.go
+++ b/chain/types/tipset_key_test.go
@@ -19,7 +19,7 @@ func TestTipSetKey(t *testing.T) {
 	fmt.Println(len(c1.Bytes()))
 
 	t.Run("zero value", func(t *testing.T) {
-		assert.Equal(t, TipSetKey{}, NewTipSetKey())
+		assert.Equal(t, EmptyTSK, NewTipSetKey())
 	})
 
 	t.Run("CID extraction", func(t *testing.T) {
diff --git a/cmd/lotus-shed/sectors.go b/cmd/lotus-shed/sectors.go
index 6cf6ee86e..cf40e1152 100644
--- a/cmd/lotus-shed/sectors.go
+++ b/cmd/lotus-shed/sectors.go
@@ -254,7 +254,7 @@ var terminateSectorPenaltyEstimationCmd = &cli.Command{
 
 		//TODO: 4667 add an option to give a more precise estimation with pending termination penalty excluded
 
-		invocResult, err := nodeApi.StateCall(ctx, msg, types.TipSetKey{})
+		invocResult, err := nodeApi.StateCall(ctx, msg, types.EmptyTSK)
 		if err != nil {
 			return xerrors.Errorf("fail to state call: %w", err)
 		}
diff --git a/node/impl/full/gas.go b/node/impl/full/gas.go
index a3bbc8d78..7b624d39b 100644
--- a/node/impl/full/gas.go
+++ b/node/impl/full/gas.go
@@ -324,7 +324,7 @@ func gasEstimateGasLimit(
 
 func (m *GasModule) GasEstimateMessageGas(ctx context.Context, msg *types.Message, spec *api.MessageSendSpec, _ types.TipSetKey) (*types.Message, error) {
 	if msg.GasLimit == 0 {
-		gasLimit, err := m.GasEstimateGasLimit(ctx, msg, types.TipSetKey{})
+		gasLimit, err := m.GasEstimateGasLimit(ctx, msg, types.EmptyTSK)
 		if err != nil {
 			return nil, xerrors.Errorf("estimating gas used: %w", err)
 		}
@@ -332,7 +332,7 @@ func (m *GasModule) GasEstimateMessageGas(ctx context.Context, msg *types.Messag
 	}
 
 	if msg.GasPremium == types.EmptyInt || types.BigCmp(msg.GasPremium, types.NewInt(0)) == 0 {
-		gasPremium, err := m.GasEstimateGasPremium(ctx, 10, msg.From, msg.GasLimit, types.TipSetKey{})
+		gasPremium, err := m.GasEstimateGasPremium(ctx, 10, msg.From, msg.GasLimit, types.EmptyTSK)
 		if err != nil {
 			return nil, xerrors.Errorf("estimating gas price: %w", err)
 		}
diff --git a/storage/wdpost_run.go b/storage/wdpost_run.go
index 4218daea1..cec86a09b 100644
--- a/storage/wdpost_run.go
+++ b/storage/wdpost_run.go
@@ -821,7 +821,7 @@ func (s *WindowPoStScheduler) setSender(ctx context.Context, msg *types.Message,
 	// estimate
 	minGasFeeMsg := *msg
 
-	minGasFeeMsg.GasPremium, err = s.api.GasEstimateGasPremium(ctx, 5, msg.From, msg.GasLimit, types.TipSetKey{})
+	minGasFeeMsg.GasPremium, err = s.api.GasEstimateGasPremium(ctx, 5, msg.From, msg.GasLimit, types.EmptyTSK)
 	if err != nil {
 		log.Errorf("failed to estimate minimum gas premium: %+v", err)
 		minGasFeeMsg.GasPremium = msg.GasPremium