diff --git a/client/web/admin/src/components/Workflow/CWorkflowEditorTriggers.vue b/client/web/admin/src/components/Workflow/CWorkflowEditorTriggers.vue
index bfa52f303..716ea03e6 100644
--- a/client/web/admin/src/components/Workflow/CWorkflowEditorTriggers.vue
+++ b/client/web/admin/src/components/Workflow/CWorkflowEditorTriggers.vue
@@ -18,7 +18,11 @@
           v-for="(c, index) in trigger.item.constraints"
           :key="index"
         >
-          {{ c.name[0].toUpperCase() + c.name.slice(1).toLowerCase() }} {{ c.op }} "{{ c.values.join(' or ') }}"
+          <template
+            v-if="c.name"
+          >
+            {{ c.name[0].toUpperCase() + c.name.slice(1).toLowerCase() }} {{ c.op }} "{{ c.values.join(' or ') }}"
+          </template>
           <code
             v-if="index < trigger.item.constraints.length - 1"
           >
diff --git a/client/web/workflow/src/components/Configurator/Trigger.vue b/client/web/workflow/src/components/Configurator/Trigger.vue
index 66ebb52cf..2408a9476 100644
--- a/client/web/workflow/src/components/Configurator/Trigger.vue
+++ b/client/web/workflow/src/components/Configurator/Trigger.vue
@@ -453,7 +453,6 @@ export default {
 
     eventChanged () {
       this.item.triggers.constraints = []
-      this.addConstraint()
       this.$root.$emit('change-detected')
       this.updateDefaultName()
     },