diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
index 4f27db7fdf..f72c59f7b8 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
@@ -769,6 +769,7 @@
     create index IDX_TaskEvent_taskId on TaskEvent (taskId);
     create index IDX_TaskEvent_processInstanceId on TaskEvent (processInstanceId);
 
+    create index IDX_EventTypes_Id ON EventTypes(InstanceId);
     create index IDX_EventTypes_IdElement ON EventTypes(InstanceId, element);
 
     create index IDX_CMI_Context ON ContextMappingInfo(CONTEXT_ID);    
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-cluster-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-cluster-jbpm-schema.sql
index 3bd49e6013..31fcf1a2b4 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-cluster-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-cluster-jbpm-schema.sql
@@ -788,6 +788,7 @@
     create index IDX_TaskEvent_taskId on TaskEvent (taskId);
     create index IDX_TaskEvent_processInstanceId on TaskEvent (processInstanceId);
 
+    create index IDX_EventTypes_Id ON EventTypes(InstanceId);
     create index IDX_EventTypes_IdElement ON EventTypes(InstanceId, element);
 
     create index IDX_CMI_Context ON ContextMappingInfo(CONTEXT_ID);    
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
index 558a6b4509..c28e98bc72 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
@@ -768,6 +768,7 @@
     create index IDX_TaskEvent_taskId on TaskEvent (taskId);
     create index IDX_TaskEvent_processInstanceId on TaskEvent (processInstanceId);
 
+    create index IDX_EventTypes_Id ON EventTypes(InstanceId);
     create index IDX_EventTypes_IdElement ON EventTypes(InstanceId, element);
 
     create index IDX_CMI_Context ON ContextMappingInfo(CONTEXT_ID);