diff --git a/umap/static/umap/js/modules/rendering/ui.js b/umap/static/umap/js/modules/rendering/ui.js
index 92486c4f..247b3000 100644
--- a/umap/static/umap/js/modules/rendering/ui.js
+++ b/umap/static/umap/js/modules/rendering/ui.js
@@ -267,6 +267,8 @@ const PathMixin = {
   },
 
   makeGeometryEditable: function () {
+    // Feature has been removed since then?
+    if (!this._map) return
     if (this._map._umap.editedFeature !== this.feature) {
       this.disableEdit()
       return