diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/CodegenNodeInstanceFactoryRegistry.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/CodegenNodeInstanceFactoryRegistry.java
index e7c89eda05c..a3dd4f5f391 100644
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/CodegenNodeInstanceFactoryRegistry.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/CodegenNodeInstanceFactoryRegistry.java
@@ -24,11 +24,7 @@
 
 public class CodegenNodeInstanceFactoryRegistry extends NodeInstanceFactoryRegistry {
 
-    @Override
-    protected NodeInstanceFactory get(Class<?> clazz) {
-        if (SubProcessNode.class == clazz) {
-            return new DefaultNodeInstanceFactory(SubProcessNode.class, LambdaSubProcessNodeInstance::new);
-        }
-        return super.get(clazz);
+    public CodegenNodeInstanceFactoryRegistry() {
+        register(SubProcessNode.class, new DefaultNodeInstanceFactory(SubProcessNode.class, LambdaSubProcessNodeInstance::new));
     }
 }