diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java
index 3eb2e4b14..917e61aca 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java
@@ -13,6 +13,7 @@ import org.flowable.engine.RuntimeService;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.engine.impl.util.ProcessDefinitionUtil;
+import org.flowable.task.api.TaskQuery;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,10 +51,12 @@ public class CustomActivityTriggerCmd extends AbstractCommand<Void> implements S
         ProcessEngineConfigurationImpl processEngineConfiguration =
                 CommandContextUtil.getProcessEngineConfiguration(commandContext);
 
-        TaskEntity task = (TaskEntity) processEngineConfiguration.getTaskService().createTaskQuery()
-                .executionId(dto.getTriggerId())
-                .taskDefinitionKey(StringUtils.isBlank(dto.getActivityId()) ? null : dto.getActivityId())
-                .singleResult();
+        TaskQuery taskQuery = processEngineConfiguration.getTaskService().createTaskQuery()
+                .executionId(dto.getTriggerId());
+        if (StringUtils.isNotBlank(dto.getActivityId())) {
+            taskQuery.taskDefinitionKey(dto.getActivityId());
+        }
+        TaskEntity task = (TaskEntity) taskQuery.singleResult();
         if (Objects.isNull(task)) {
             throw new WorkflowEngineException(ACTIVITY_TRIGGER_NOT_EXISTS, dto.getTriggerId());
         }