diff --git a/src/index.js b/src/index.js
index 7853874..2645a15 100644
--- a/src/index.js
+++ b/src/index.js
@@ -488,6 +488,8 @@ app.get('/api/v1/nodes/:nodeId/position-history', async (req, res) => {
                 latitude: position.latitude,
                 longitude: position.longitude,
                 altitude: position.altitude,
+                gateway_id: position.gateway_id,
+                channel_id: position.channel_id,
                 created_at: position.created_at,
             });
         });
diff --git a/src/public/index.html b/src/public/index.html
index ee822bf..80fc96f 100644
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -3818,7 +3818,15 @@
 
                 let tooltip = "";
                 tooltip += `<b>${moment(new Date(positionHistory.created_at)).format("DD/MM/YYYY hh:mm A")}</b></br>`;
-                tooltip += `Position: ${positionHistory.latitude}, ${positionHistory.longitude}</br>`;
+                tooltip += `Position: ${positionHistory.latitude}, ${positionHistory.longitude}</br>`
+
+                // add gateway info if available
+                if(positionHistory.gateway_id){
+                    const gatewayNode = findNodeById(positionHistory.gateway_id);
+                    if(gatewayNode){
+                        tooltip += `Heard by: <a href="javascript:void(0);" onclick="goToNode(${gatewayNode.node_id})">[${gatewayNode.short_name}] ${gatewayNode.long_name}</a>`;
+                    }
+                }
 
                 // create position history marker
                 const marker = L.marker([positionHistory.latitude, longitude],{