diff --git a/eth/catalyst/l2_api.go b/eth/catalyst/l2_api.go
index 2655114c3..912d19579 100644
--- a/eth/catalyst/l2_api.go
+++ b/eth/catalyst/l2_api.go
@@ -86,6 +86,9 @@ func (api *l2ConsensusAPI) AssembleL2Block(params AssembleL2BlockParams) (*Execu
 	if params.Timestamp != nil {
 		timestamp = time.Unix(int64(*params.Timestamp), 0)
 	}
+	if api.eth.BlockChain().Config().IsMPTFork(uint64(timestamp.Unix())) == api.eth.BlockChain().Config().Morph.UseZktrie {
+		return nil, fmt.Errorf("cannot assemble block for fork, useZKtrie: %v, please switch geth", api.eth.BlockChain().Config().Morph.UseZktrie)
+	}
 	newBlockResult, err := api.eth.Miner().BuildBlock(parent.Hash(), timestamp, transactions)
 	if err != nil {
 		return nil, err