diff --git a/src/UI/Studio/EditLayerState.ts b/src/UI/Studio/EditLayerState.ts
index 2f80830ec9..75e821a9dd 100644
--- a/src/UI/Studio/EditLayerState.ts
+++ b/src/UI/Studio/EditLayerState.ts
@@ -297,16 +297,25 @@ export default class EditLayerState extends EditJsonState<LayerConfigJson> {
 
         this.addMissingTagRenderingIds()
 
-        this.configuration.addCallbackAndRunD((layer) => {
-            if (layer.tagRenderings) {
+
+        function cleanArray(data: object, key: string): boolean{
+            if (data[key]) {
                 // A bit of cleanup
-                const lBefore = layer.tagRenderings.length
-                const cleaned = Utils.NoNull(layer.tagRenderings)
+                const lBefore = data[key].length
+                const cleaned = Utils.NoNull(data[key])
                 if (cleaned.length != lBefore) {
-                    layer.tagRenderings = cleaned
-                    this.configuration.ping()
+                    data[key] = cleaned
+                    return true
                 }
             }
+            return false
+        }
+
+        this.configuration.addCallbackAndRunD((layer) => {
+            const changed = cleanArray(layer, "tagRenderings") || cleanArray(layer, "pointRenderings")
+            if(changed){
+                this.configuration.ping()
+            }
         })
     }