diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 0b3aada8c5..c594d1a820 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -37,6 +37,7 @@
                     <ConditionEdit :condition-identifier="conditionIdentifier"
                                    :is-current="currentConditionIdentifier"
                                    @update-current-condition="updateCurrentCondition"
+                                   @remove-condition="removeCondition"
                     />
                 </div>
                 <div v-else>
@@ -136,8 +137,10 @@ export default {
             this.conditions[index] = updatedCondition;
         },
         removeCondition(identifier) {
-            let index = _.findIndex(this.conditionCollection, (condition) => this.openmct.objects.makeKeyString(identifier) === condition.identifier.key);
-            this.conditionCollection.splice(index, 1);
+            let index = _.findIndex(this.conditionCollection, (condition) => {
+                identifier.key === condition.key
+            });
+            this.conditionCollection.splice(index + 1, 1);
         },
         reorder(reorderPlan) {
             let oldConditions = this.conditionCollection.slice();
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 4c60c0abec..6ec535bab3 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -177,6 +177,7 @@ export default {
     },
     methods: {
         removeCondition(ev) {
+            this.$emit('remove-condition', this.conditionIdentifier);
             // const conditionDiv = ev.target.closest('.conditionArea');
             // const conditionCollectionDiv = conditionDiv.closest('.condition-collection');
             // const index = Array.from(conditionCollectionDiv.children).indexOf(conditionDiv);