diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index b628763019..6381494362 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -122,7 +122,7 @@
 
             <template v-if="telemetry.length || condition.configuration.criteria.length">
                 <div v-for="(criterion, index) in condition.configuration.criteria"
-                     :key="index"
+                     :key="criterion.telemetry.key"
                      class="c-cdef__criteria"
                 >
                     <Criterion :telemetry="telemetry"
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 2b881eabc5..fa5451aef1 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -172,7 +172,6 @@ export default {
                     }
                 }
             }
-            this.checkTelemetry();
             return inputCount;
         }
     },
@@ -185,6 +184,7 @@ export default {
         }
     },
     mounted() {
+        console.log(this.criterion);
         this.updateMetadataOptions();
     },
     methods: {
@@ -287,9 +287,7 @@ export default {
             }
         },
         persist() {
-            if (this.criterion.telemetry && this.criterion.metadata !== '' && this.criterion.operation !== '') {
-                this.$emit('persist', this.criterion);
-            }
+            this.$emit('persist', this.criterion);
         }
     }
 };