diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57db1d602..d649a60db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Not released
 
+- Fix geometry edit in Feature Selection [#854](https://github.com/CartoDB/carto-react/pull/854)
+
 ## 2.4
 
 ### 2.4.0 (2024-03-08)
diff --git a/packages/react-widgets/src/layers/FeatureSelectionLayer.js b/packages/react-widgets/src/layers/FeatureSelectionLayer.js
index 5ec2a83f7..cd65569d5 100644
--- a/packages/react-widgets/src/layers/FeatureSelectionLayer.js
+++ b/packages/react-widgets/src/layers/FeatureSelectionLayer.js
@@ -101,12 +101,17 @@ export default function FeatureSelectionLayer(
           if (updatedData.features.length !== 0 && !editType.includes('Tentative')) {
             const [lastFeature] = updatedData.features.slice(-1);
             const intersectionPoints = kinks(lastFeature).features.length;
-            lastFeature.properties.invalid = intersectionPoints > 0;
 
             if (lastFeature) {
               dispatch(
                 addSpatialFilter({
-                  geometry: lastFeature
+                  geometry: {
+                    ...lastFeature,
+                    properties: {
+                      ...lastFeature.properties,
+                      invalid: intersectionPoints > 0
+                    }
+                  }
                 })
               );
             }