diff --git a/src/app/components/leaflet-map/leaflet-map.component.ts b/src/app/components/leaflet-map/leaflet-map.component.ts
index d6b955f..996c10f 100644
--- a/src/app/components/leaflet-map/leaflet-map.component.ts
+++ b/src/app/components/leaflet-map/leaflet-map.component.ts
@@ -13,7 +13,6 @@ import 'leaflet.markercluster';
 import { Pin } from '../../model/Pin';
 import { AuthService } from '../../services/auth/auth.service';
 import { AutocompleteService } from '../../services/auto-complete/auto-complete.service';
-import { CookiesService } from '../../services/cookies/cookies.service';
 import { IntroService } from '../../services/intro/intro.service';
 import { MapReloadService } from '../../services/map-reload/map-reload.service';
 import { ModalService } from '../../services/modal/modal.service';
@@ -311,7 +310,9 @@ export class LeafletMapComponent implements OnInit {
       });
 
       marker.on('popupclose', () => {
-        this.router.navigate(['/map']);
+        if (this.router.url.includes('/map')) {
+          this.router.navigate(['/map']);
+        }
       });
 
       marker.on('popupopen', () => {