diff --git a/backend/src/api/explorer/nodes.api.ts b/backend/src/api/explorer/nodes.api.ts
index 1f255dd70..590ed1f20 100644
--- a/backend/src/api/explorer/nodes.api.ts
+++ b/backend/src/api/explorer/nodes.api.ts
@@ -5,7 +5,8 @@ class NodesApi {
   public async $getNode(public_key: string): Promise<any> {
     try {
       const query = `
-        SELECT nodes.*, geo_names_as.names as as_organization, geo_names_city.names as city, geo_names_country.names as country, 
+        SELECT nodes.*, geo_names_as.names as as_organization, geo_names_city.names as city,
+        geo_names_country.names as country, geo_names_subdivision.names as subdivision,
           (SELECT Count(*)
           FROM channels
           WHERE channels.status < 2 AND ( channels.node1_public_key = ? OR channels.node2_public_key = ? )) AS channel_count,
@@ -18,12 +19,14 @@ class NodesApi {
         FROM nodes
         LEFT JOIN geo_names geo_names_as on geo_names_as.id = as_number
         LEFT JOIN geo_names geo_names_city on geo_names_city.id = city_id
+        LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = subdivision_id
         LEFT JOIN geo_names geo_names_country on geo_names_country.id = country_id
         WHERE public_key = ?
       `;
       const [rows]: any = await DB.query(query, [public_key, public_key, public_key, public_key, public_key, public_key, public_key]);
       if (rows.length > 0) {
         rows[0].as_organization = JSON.parse(rows[0].as_organization);
+        rows[0].subdivision = JSON.parse(rows[0].subdivision);
         rows[0].city = JSON.parse(rows[0].city);
         rows[0].country = JSON.parse(rows[0].country);
         return rows[0];
diff --git a/frontend/src/app/lightning/node/node.component.html b/frontend/src/app/lightning/node/node.component.html
index 8467c2d48..aae920530 100644
--- a/frontend/src/app/lightning/node/node.component.html
+++ b/frontend/src/app/lightning/node/node.component.html
@@ -33,12 +33,13 @@
                   <app-sats [satoshis]="node.channels_capacity_avg"></app-sats><app-fiat [value]="node.channels_capacity_avg" digitsInfo="1.0-0"></app-fiat>
                 </td>
               </tr>
-              <tr *ngIf="node.country || node.city">
+              <tr *ngIf="node.country && node.city && node.subdivision">
                 <td i18n="location">Location</td>
-                <td>
-                  <span *ngIf="node.country">{{ node.country.en }}</span>
-                  <span *ngIf="node.city"> ({{ node.city.en }})</span>
-                </td>
+                <td>{{ node.city.en }}, {{ node.subdivision.en }}<br>{{ node.country.en }}</td>
+              </tr>
+              <tr *ngIf="node.country && !node.city">
+                <td i18n="location">Location</td>
+                <td>{{ node.country.en }}</td>
               </tr>
             </tbody>
           </table>
@@ -66,7 +67,7 @@
               <tr *ngIf="node.country">
                 <td i18n="isp">ISP</td>
                 <td>
-                  {{ node.as_organization }}
+                  {{ node.as_organization }} [ASN {{node.as_number}}]
                 </td>
               </tr>
             </tbody>