diff --git a/src/Logic/FeatureSource/Sources/LastClickFeatureSource.ts b/src/Logic/FeatureSource/Sources/LastClickFeatureSource.ts
index 3d3871d16a..71d90914f2 100644
--- a/src/Logic/FeatureSource/Sources/LastClickFeatureSource.ts
+++ b/src/Logic/FeatureSource/Sources/LastClickFeatureSource.ts
@@ -18,6 +18,7 @@ export class LastClickFeatureSource implements FeatureSource {
     private readonly hasNoteLayer: boolean
     public static readonly newPointElementId = "new_point_dialog"
     public readonly features: Store<Feature[]>
+    private readonly _features: UIEventSource<Feature[]>
     private _usermode: UIEventSource<string>
     private _enabledAddMorePoints: UIEventSource<boolean>
     constructor(
@@ -53,9 +54,13 @@ export class LastClickFeatureSource implements FeatureSource {
             )
         )
 
-        this.features = clickSource.mapD(({ lon, lat, mode }) => [
-            this.createFeature(lon, lat, mode),
-        ])
+        this._features = new UIEventSource<Feature[]>([])
+        this.features = this._features
+        clickSource.addCallbackAndRunD(({ lon, lat, mode }) => {
+            this._features.setData([
+                this.createFeature(lon, lat, mode)
+            ])
+        })
     }
 
     public createFeature(
@@ -85,4 +90,8 @@ export class LastClickFeatureSource implements FeatureSource {
             },
         }
     }
+
+    clear() {
+        this._features.setData([])
+    }
 }
diff --git a/src/Models/ThemeViewState.ts b/src/Models/ThemeViewState.ts
index 26b608e76c..480bdbda72 100644
--- a/src/Models/ThemeViewState.ts
+++ b/src/Models/ThemeViewState.ts
@@ -853,6 +853,8 @@ export default class ThemeViewState implements SpecialVisualizationState {
         this.selectedElement.addCallback((selected) => {
             if (selected === undefined) {
                 this.focusOnMap()
+            }else{
+                this.lastClickObject.clear()
             }
         })
         this.guistate.allToggles.forEach((toggle) => {