diff --git a/service/history/timerQueueStandbyTaskExecutor.go b/service/history/timerQueueStandbyTaskExecutor.go index 647db8dbf4e..82a8f949888 100644 --- a/service/history/timerQueueStandbyTaskExecutor.go +++ b/service/history/timerQueueStandbyTaskExecutor.go @@ -440,8 +440,8 @@ func (t *timerQueueStandbyTaskExecutor) processTimer( return err } if !nsRecord.IsOnCluster(t.clusterName) { - // discard standby tasks - return consts.ErrTaskDiscarded + // namespace is not replicated to local cluster, ignore corresponding tasks + return nil } executionContext, release, err := getWorkflowExecutionContextForTask(ctx, t.cache, timerTask) diff --git a/service/history/transferQueueStandbyTaskExecutor.go b/service/history/transferQueueStandbyTaskExecutor.go index 94b8ac0896a..77ee9a7176f 100644 --- a/service/history/transferQueueStandbyTaskExecutor.go +++ b/service/history/transferQueueStandbyTaskExecutor.go @@ -508,8 +508,8 @@ func (t *transferQueueStandbyTaskExecutor) processTransfer( return err } if !nsRecord.IsOnCluster(t.clusterName) { - // discard standby tasks - return consts.ErrTaskDiscarded + // namespace is not replicated to local cluster, ignore corresponding tasks + return nil } weContext, release, err := getWorkflowExecutionContextForTask(ctx, t.cache, taskInfo)