diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js
index 69ebeb17..e46abfe3 100644
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -714,11 +714,13 @@ class Waypoint {
           });
       });
 
-    this.description(false).then((description) =>
-      marker.bindTooltip(description, {
-        permanent: zoom >= SHOW_WAYPOINT_INFO_AT_ZOOM,
-      })
-    );
+    if (this.flight.selected) {
+      this.description(false).then((description) =>
+        marker.bindTooltip(description, {
+          permanent: zoom >= SHOW_WAYPOINT_INFO_AT_ZOOM,
+        })
+      );
+    }
 
     return marker;
   }