diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java
index 67089a4d3fd..165d3291135 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java
@@ -1646,7 +1646,8 @@ protected boolean sameBoundaryEventDefinition(BoundaryEvent sourceEvent, Boundar
             return false;
         }
         
-        if (sourceEvent.getEventDefinitions() != null && !sourceEvent.getEventDefinitions().isEmpty()) {
+        if (sourceEvent.getEventDefinitions() != null && !sourceEvent.getEventDefinitions().isEmpty()
+                && targetEvent.getEventDefinitions() != null && !targetEvent.getEventDefinitions().isEmpty()) {
             EventDefinition sourceEventDef = sourceEvent.getEventDefinitions().get(0);
             EventDefinition targetEventDef = targetEvent.getEventDefinitions().get(0);