diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js
index 86ef1795..e9b5878a 100644
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@@ -315,7 +315,7 @@ window.plugin.playerTracker.drawData = function() {
     popup += '<br>'
         + ago(last.time, now) + ' ago<br>'
         + window.chat.getChatPortalName(last);
-    // show previous data in tooltip
+    // show previous data in popup
     if(evtsLength >= 2) {
       popup += '<br>&nbsp;<br>previous locations:<br>'
           + '<table style="border-spacing:0">';
@@ -356,6 +356,11 @@ window.plugin.playerTracker.drawData = function() {
     var m = L.marker(gllfe(last), {icon: icon, referenceToPortal: closestPortal, opacity: absOpacity, desc: popup, title: tooltip});
 //    m.bindPopup(title);
 
+    if (tooltip) {
+      // ensure tooltips are closed, sometimes they linger
+      m.on('mouseout', function() { $(this._icon).tooltip('close'); });
+    }
+
     m.addTo(playerData.team === 'RESISTANCE' ? plugin.playerTracker.drawnTracesRes : plugin.playerTracker.drawnTracesEnl);
     plugin.playerTracker.oms.addMarker(m);