diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx
index 339b4de749..8a8647f392 100644
--- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx
+++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx
@@ -127,16 +127,11 @@ export const ConstraintAccordionEdit = ({
 
         setLocalConstraint(previousChange);
         setConstraintChanges((prev) => prev.slice(0, prev.length - 1));
+        autoSave(previousChange);
     };
 
-    const recordChange = (localConstraint: IConstraint) => {
-        setConstraintChanges((prev) => [...prev, localConstraint]);
-
-        if (
-            onAutoSave &&
-            localConstraint.values &&
-            localConstraint.values.length > 0
-        ) {
+    const autoSave = (localConstraint: IConstraint) => {
+        if (onAutoSave) {
             onAutoSave(localConstraint);
         }
 
@@ -145,6 +140,11 @@ export const ConstraintAccordionEdit = ({
         }
     };
 
+    const recordChange = (localConstraint: IConstraint) => {
+        setConstraintChanges((prev) => [...prev, localConstraint]);
+        autoSave(localConstraint);
+    };
+
     const setContextName = useCallback((contextName: string) => {
         setLocalConstraint((prev) => {
             const localConstraint = cleanConstraint({
@@ -231,7 +231,7 @@ export const ConstraintAccordionEdit = ({
             const valueCopy = [...localConstraint.values!];
             valueCopy.splice(index, 1);
 
-            setValues(valueCopy);
+            setValuesWithRecord(valueCopy);
         },
         [localConstraint, setValues],
     );