diff --git a/common/types/mapper/proto/shared.go b/common/types/mapper/proto/shared.go
index 3bf05b4c25a..c11a0e02d91 100644
--- a/common/types/mapper/proto/shared.go
+++ b/common/types/mapper/proto/shared.go
@@ -592,7 +592,6 @@ func FromHistoryTaskV2Attributes(t *types.HistoryTaskV2Attributes) *adminv1.Hist
 		return nil
 	}
 	return &adminv1.HistoryTaskV2Attributes{
-		TaskId:              t.TaskID,
 		DomainId:            t.DomainID,
 		WorkflowExecution:   FromWorkflowRunPair(t.WorkflowID, t.RunID),
 		VersionHistoryItems: FromVersionHistoryItemArray(t.VersionHistoryItems),
@@ -606,7 +605,6 @@ func ToHistoryTaskV2Attributes(t *adminv1.HistoryTaskV2Attributes) *types.Histor
 		return nil
 	}
 	return &types.HistoryTaskV2Attributes{
-		TaskID:              t.TaskId,
 		DomainID:            t.DomainId,
 		WorkflowID:          ToWorkflowID(t.WorkflowExecution),
 		RunID:               ToRunID(t.WorkflowExecution),
diff --git a/common/types/mapper/thrift/replicator.go b/common/types/mapper/thrift/replicator.go
index 0f1485736c8..afe3cdf64e1 100644
--- a/common/types/mapper/thrift/replicator.go
+++ b/common/types/mapper/thrift/replicator.go
@@ -300,7 +300,6 @@ func FromHistoryTaskV2Attributes(t *types.HistoryTaskV2Attributes) *replicator.H
 		return nil
 	}
 	return &replicator.HistoryTaskV2Attributes{
-		TaskId:              &t.TaskID,
 		DomainId:            &t.DomainID,
 		WorkflowId:          &t.WorkflowID,
 		RunId:               &t.RunID,
@@ -316,7 +315,6 @@ func ToHistoryTaskV2Attributes(t *replicator.HistoryTaskV2Attributes) *types.His
 		return nil
 	}
 	return &types.HistoryTaskV2Attributes{
-		TaskID:              t.GetTaskId(),
 		DomainID:            t.GetDomainId(),
 		WorkflowID:          t.GetWorkflowId(),
 		RunID:               t.GetRunId(),
diff --git a/common/types/replicator.go b/common/types/replicator.go
index 18784ac8fdd..ec0d1d1963c 100644
--- a/common/types/replicator.go
+++ b/common/types/replicator.go
@@ -307,7 +307,6 @@ func (v *GetReplicationMessagesResponse) GetMessagesByShard() (o map[int32]*Repl
 
 // HistoryTaskV2Attributes is an internal type (TBD...)
 type HistoryTaskV2Attributes struct {
-	TaskID              int64                 `json:"taskId,omitempty"`
 	DomainID            string                `json:"domainId,omitempty"`
 	WorkflowID          string                `json:"workflowId,omitempty"`
 	RunID               string                `json:"runId,omitempty"`
diff --git a/common/types/testdata/replication.go b/common/types/testdata/replication.go
index 6da97437870..4db9a8ce58c 100644
--- a/common/types/testdata/replication.go
+++ b/common/types/testdata/replication.go
@@ -129,7 +129,6 @@ var (
 		VersionHistory:     &VersionHistory,
 	}
 	HistoryTaskV2Attributes = types.HistoryTaskV2Attributes{
-		TaskID:              TaskID,
 		DomainID:            DomainID,
 		WorkflowID:          WorkflowID,
 		RunID:               RunID,
diff --git a/host/ndc/integration_test.go b/host/ndc/integration_test.go
index 1e388017a09..e6215c6a9d1 100644
--- a/host/ndc/integration_test.go
+++ b/host/ndc/integration_test.go
@@ -2406,7 +2406,6 @@ func (s *NDCIntegrationTestSuite) applyEventsThroughFetcher(
 			TaskType:     &taskType,
 			SourceTaskID: 1,
 			HistoryTaskV2Attributes: &types.HistoryTaskV2Attributes{
-				TaskID:              1,
 				DomainID:            s.domainID,
 				WorkflowID:          workflowID,
 				RunID:               runID,
diff --git a/service/history/replication/task_ack_manager.go b/service/history/replication/task_ack_manager.go
index fcd5cffcf41..5ada9c88872 100644
--- a/service/history/replication/task_ack_manager.go
+++ b/service/history/replication/task_ack_manager.go
@@ -529,7 +529,6 @@ func (t *taskAckManagerImpl) generateHistoryReplicationTask(
 			replicationTask := &types.ReplicationTask{
 				TaskType: types.ReplicationTaskType.Ptr(types.ReplicationTaskTypeHistoryV2),
 				HistoryTaskV2Attributes: &types.HistoryTaskV2Attributes{
-					TaskID:              task.FirstEventID,
 					DomainID:            task.DomainID,
 					WorkflowID:          task.WorkflowID,
 					RunID:               task.RunID,