diff --git a/frontend/web/components/modals/Rule.tsx b/frontend/web/components/modals/Rule.tsx
index 99aef54f41ba..e17fb85598c5 100644
--- a/frontend/web/components/modals/Rule.tsx
+++ b/frontend/web/components/modals/Rule.tsx
@@ -29,7 +29,13 @@ export default class Rule extends PureComponent<{
         rule: { conditions: rules },
       },
     } = this
-    const isLastRule = i === rules.length - 1
+    const lastIndex = rules.reduce((acc, v, i) => {
+      if (!v.delete) {
+        return i
+      }
+      return acc
+    }, 0)
+    const isLastRule = i === lastIndex
     const hasOr = i > 0
     const operatorObj = Utils.findOperator(rule.operator, rule.value, operators)
     const operator = operatorObj && operatorObj.value
@@ -206,6 +212,11 @@ export default class Rule extends PureComponent<{
       rules[i].value = ''
     }
 
+    if (prop === 'delete') {
+      rules[i].property = 'deleted'
+      rules[i].value = 'deleted'
+    }
+
     if (!rule.conditions.filter((condition) => !condition.delete).length) {
       rule.delete = true
     }