diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/lib/components/tabs/MapTab.svelte b/frontend/src/lib/components/tabs/MapTab.svelte
index 5654db2..562c142 100644
--- a/frontend/src/lib/components/tabs/MapTab.svelte
+++ b/frontend/src/lib/components/tabs/MapTab.svelte
@@ -48,9 +48,7 @@
         navigator.geolocation.watchPosition(success, error, options);
     };
 
-	onMount(async () => {
-		await watchPosition();
-		leaflet = await import('leaflet');
+	const renderMap = () => {
 		layerGroup = leaflet.layerGroup();
 
 		// Startup Map
@@ -61,7 +59,7 @@
 		});
 
 		map.setView(pianelloCoordinates, 13);
-		
+
 		map.setMaxBounds(map.getBounds());
 
 		leaflet
@@ -70,6 +68,12 @@
 					'&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
 			})
 		.addTo(map);
+	}
+
+	onMount(async () => {
+		await watchPosition();
+		leaflet = await import('leaflet');
+		renderMap()
 	});
 
 	onDestroy(async () => {