diff --git a/web/src/components/LeafletMap.tsx b/web/src/components/LeafletMap.tsx
index f71122ce4..6cffccee6 100644
--- a/web/src/components/LeafletMap.tsx
+++ b/web/src/components/LeafletMap.tsx
@@ -1,8 +1,8 @@
 import { DivIcon, LatLng } from "leaflet";
 import { MapPinIcon } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import ReactDOMServer from "react-dom/server";
-import { MapContainer, Marker, TileLayer, useMapEvents } from "react-leaflet";
+import { MapContainer, Marker, TileLayer, useMap, useMapEvents } from "react-leaflet";
 
 const markerIcon = new DivIcon({
   className: "relative border-none",
@@ -17,6 +17,7 @@ interface MarkerProps {
 
 const LocationMarker = (props: MarkerProps) => {
   const [position, setPosition] = useState(props.position);
+  const initializedRef = useRef(false);
 
   const map = useMapEvents({
     click(e) {
@@ -33,9 +34,12 @@ const LocationMarker = (props: MarkerProps) => {
   });
 
   useEffect(() => {
-    map.attributionControl.setPrefix("");
-    map.locate();
-  }, []);
+    if (!initializedRef.current) {
+      map.attributionControl.setPrefix("");
+      map.locate();
+      initializedRef.current = true;
+    }
+  }, [map]);
 
   // Keep marker and map in sync with external position updates
   useEffect(() => {
@@ -50,6 +54,27 @@ const LocationMarker = (props: MarkerProps) => {
   return position === undefined ? null : <Marker position={position} icon={markerIcon}></Marker>;
 };
 
+const MapCleanup = () => {
+  const map = useMap();
+
+  useEffect(() => {
+    return () => {
+      // Cleanup map instance when component unmounts
+      setTimeout(() => {
+        if (map) {
+          try {
+            map.remove();
+          } catch {
+            // Ignore errors during cleanup
+          }
+        }
+      }, 0);
+    };
+  }, [map]);
+
+  return null;
+};
+
 interface MapProps {
   readonly?: boolean;
   latlng?: LatLng;
@@ -64,6 +89,7 @@ const LeafletMap = (props: MapProps) => {
     <MapContainer className="w-full h-72" center={position} zoom={13} scrollWheelZoom={false}>
       <TileLayer url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" />
       <LocationMarker position={position} readonly={props.readonly} onChange={props.onChange ? props.onChange : () => {}} />
+      <MapCleanup />
     </MapContainer>
   );
 };
diff --git a/web/src/components/MemoEditor/ActionButton/InsertMenu/LocationDialog.tsx b/web/src/components/MemoEditor/ActionButton/InsertMenu/LocationDialog.tsx
index 52c367106..6a33c3913 100644
--- a/web/src/components/MemoEditor/ActionButton/InsertMenu/LocationDialog.tsx
+++ b/web/src/components/MemoEditor/ActionButton/InsertMenu/LocationDialog.tsx
@@ -51,7 +51,7 @@ export const LocationDialog = ({
         </VisuallyHidden>
         <div className="flex flex-col">
           <div className="w-full h-64 overflow-hidden rounded-t-md bg-muted/30">
-            <LeafletMap key={JSON.stringify(locationInitialized)} latlng={position} onChange={onPositionChange} />
+            <LeafletMap latlng={position} onChange={onPositionChange} />
           </div>
           <div className="w-full flex flex-col p-3 gap-3">
             <div className="grid grid-cols-2 gap-3">