diff --git a/new-lamassu-admin/src/pages/Triggers/components/helper.js b/new-lamassu-admin/src/pages/Triggers/components/helper.js
index e7c660df..d284d065 100644
--- a/new-lamassu-admin/src/pages/Triggers/components/helper.js
+++ b/new-lamassu-admin/src/pages/Triggers/components/helper.js
@@ -47,8 +47,10 @@ const getOverridesSchema = (values, customInfoRequests) => {
       .required()
       .test({
         test() {
-          const { requirement } = this.parent
-          if (R.find(R.propEq('requirement', requirement))(values)) {
+          const { id, requirement } = this.parent
+          // If we're editing, filter out the override being edited so that validation schemas don't enter in circular conflicts
+          const _values = R.filter(it => it.id !== id, values)
+          if (R.find(R.propEq('requirement', requirement))(_values)) {
             return this.createError({
               message: `Requirement ${displayRequirement(
                 requirement,