diff --git a/frontend/src/app/lightning/nodes-map/nodes-map.component.ts b/frontend/src/app/lightning/nodes-map/nodes-map.component.ts
index 4f74723cc..ea80d8799 100644
--- a/frontend/src/app/lightning/nodes-map/nodes-map.component.ts
+++ b/frontend/src/app/lightning/nodes-map/nodes-map.component.ts
@@ -114,7 +114,7 @@ export class NodesMap implements OnInit, OnChanges {
           node[3], // Alias
           node[2], // Public key
           node[5], // Channels
-          node[6].en, // Country
+          node[6]?.en, // Country
           node[7], // ISO Code
         ]);
       }
diff --git a/frontend/src/app/shared/components/geolocation/geolocation.component.ts b/frontend/src/app/shared/components/geolocation/geolocation.component.ts
index 9cce1ea08..1a498a1b2 100644
--- a/frontend/src/app/shared/components/geolocation/geolocation.component.ts
+++ b/frontend/src/app/shared/components/geolocation/geolocation.component.ts
@@ -20,6 +20,11 @@ export class GeolocationComponent implements OnChanges {
   formattedLocation: string = '';
 
   ngOnChanges(): void {
+    if (!this.data) {
+      this.formattedLocation = '-';
+      return;
+    }
+
     const city = this.data.city ? this.data.city : '';
     const subdivisionLikeCity = this.data.city === this.data.subdivision;
     let subdivision = this.data.subdivision;