diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
index 5fa245c7d..8a9c3aae3 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
@@ -36,7 +36,7 @@ public abstract class AbstractBpmnEventListener<T extends OperationContext> impl
     }
 
     public static String parseProcessDefinitionKey(String processDefinitionId) {
-        if (StringUtils.hasText(processDefinitionId)) {
+        if (!StringUtils.hasText(processDefinitionId)) {
             return "";
         }
         return processDefinitionId.split(":")[0];
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
index 27abc8004..5ddcdc1d9 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
@@ -25,6 +25,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.Collections;
@@ -183,7 +184,9 @@ public class RocketMqBpmActivityEventListener extends AbstractBpmnEventListener<
             return;
         }
         Map<String, String> header = new HashMap<>();
-        header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
+            header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        }
         eventProducer.send(Event.builder()
                 .shardingKey(dto.getProcessInstanceId())
                 .eventCode(eventEnum.getEventCode())
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
index 5b216ebfe..c43fac1d0 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
@@ -392,7 +392,9 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener<
             return;
         }
         Map<String, String> header = new HashMap<>();
-        header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
+            header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        }
         eventProducer.send(Event.builder()
                 .shardingKey(dto.getProcessInstanceId())
                 .eventCode(eventEnum.getEventCode())
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java
index 0b823bc06..6aaa23bb5 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Scope;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -275,7 +276,9 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
             return;
         }
         Map<String, String> header = new HashMap<>();
-        header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
+            header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        }
         eventProducer.send(Event.builder()
                 .shardingKey(dto.getProcessInstanceId())
                 .eventCode(eventEnum.getEventCode())
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java
index 8a85e4fc5..009e40339 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java
@@ -137,7 +137,9 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene
             return;
         }
         Map<String, String> header = new HashMap<>();
-        header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
+            header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
+        }
         eventProducer.send(Event.builder()
                 .shardingKey(dto.getProcessInstanceId())
                 .eventCode(eventEnum.getEventCode())