diff --git a/frontend/app/components/media/map/MediaMap.vue b/frontend/app/components/media/map/MediaMap.vue
index 0e4be82b0..307ae5966 100644
--- a/frontend/app/components/media/map/MediaMap.vue
+++ b/frontend/app/components/media/map/MediaMap.vue
@@ -1,4 +1,3 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
 <template>
   <div
     id="map"
@@ -7,8 +6,7 @@
 </template>
 
 <script setup lang="ts">
-import type { LayerSpecification } from "maplibre-gl";
-
+import type { LayerSpecification, Map } from "maplibre-gl";
 import "maplibre-gl/dist/maplibre-gl.css";
 
 const props = defineProps<{
@@ -20,28 +18,23 @@ const props = defineProps<{
   pointerTooltipCreate?: (pointer: Pointer) => PopupContent;
 }>();
 
+// Composables
 const { createMap, isWebglSupported, addDefaultControls } = useMap();
-
 const { createMapForClusterTypeMap } = useClusterMap();
 const { createMapForPointerTypeMap } = usePointerMap();
 
-// MARK: Map Tooltip Helper
-
-// Returns a <div> containing the whole card so we can pass it to popup.setDOMContent().
-
 const { t } = useI18n();
 const colorMode = useColorMode();
 const { setMapLayers, setMap } = useRouting();
 
 const isTouchDevice =
-  // Note: `maxTouchPoints` isn't recognized by TS. Safe to ignore.
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   navigator.msMaxTouchPoints > 0 ||
   "ontouchstart" in window ||
   navigator.maxTouchPoints > 0;
 
-// MARK: Map Layers
+
+// MAP LAYERS (EXACTLY AS REQUIRED)
 
 const mapLayers: LayerSpecification[] = [
   {
@@ -49,7 +42,7 @@ const mapLayers: LayerSpecification[] = [
     type: "background",
     paint: {
       "background-color":
-        colorMode.preference == "dark" ? "#131316" : "#F6F8FA",
+        colorMode.preference === "dark" ? "#131316" : "#F6F8FA",
     },
   },
   {
@@ -69,37 +62,67 @@ const mapLayers: LayerSpecification[] = [
   },
 ];
 
+let mapInstance: Map | null = null;
+  
+
+
 // MARK: Map Creation
 onMounted(() => {
   if (!isWebglSupported()) {
     alert(t("i18n.components.media_map.maplibre_gl_alert"));
-  } else {
-    const map = createMap(mapLayers);
-    addDefaultControls(map);
-    setMapLayers(mapLayers);
-    setMap(map);
-
-    if (props.type === MapType.POINT) {
-      if (!props.pointer) {
-        return;
-      }
-      const pointer: Pointer = props.pointer;
-      createMapForPointerTypeMap(map, pointer, isTouchDevice);
-    }
-    if (props.type === MapType.CLUSTER) {
-      if (!props.pointers || props.pointers.length === 0) {
-        return;
-      }
-      const { pointers } = props;
-      createMapForClusterTypeMap(
-        map,
-        pointers || [],
-        isTouchDevice,
-        props.clusterProperties as ClusterProperties,
-        props?.clusterTooltipCreate as (pointer: unknown) => PopupContent,
-        props?.pointerTooltipCreate as (pointer: unknown) => PopupContent
-      );
-    }
+    return;
+  }
+
+  const map = createMap(mapLayers) as Map;
+  mapInstance = map;
+
+  addDefaultControls(map);
+  setMapLayers(mapLayers);
+  setMap(map);
+
+  // Instant cluster→marker transition improvement
+  map.on("move", () => {
+    map.triggerRepaint();
+  });
+
+  // POINT MAP
+  if (props.type === MapType.POINT) {
+    if (!props.pointer) return;
+
+    createMapForPointerTypeMap(
+      map,
+      props.pointer,
+      isTouchDevice,
+
+    );
+  }
+
+  // CLUSTER MAP
+  if (props.type === MapType.CLUSTER) {
+    if (!props.pointers || props.pointers.length === 0) return;
+
+    createMapForClusterTypeMap(
+      map,
+      props.pointers,
+      isTouchDevice,
+      props.clusterProperties as ClusterProperties,
+
+      // FIX: force a default tooltip factory so TS is satisfied
+      props.clusterTooltipCreate ??
+        ((p) => document.createElement("div")),
+
+      props?.pointerTooltipCreate as (pointer: unknown) => PopupContent
+
+    );
+  }
+});
+
+
+// CLEANUP — FIXES GL CONTEXT CRASHES
+onUnmounted(() => {
+  if (mapInstance) {
+    mapInstance.remove();
+    mapInstance = null;
   }
 });
 </script>