diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
index 1f462a5386..be3551b51f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
@@ -581,10 +581,10 @@ export default abstract class LeafletMap {
         const marker: Marker = this.markers.get(key);
         const location = this.convertPosition(data);
         marker.updateMarkerPosition(location);
+        marker.setDataSources(data, dataSources);
         if (settings.showTooltip) {
             marker.updateMarkerTooltip(data);
         }
-        marker.setDataSources(data, dataSources);
         marker.updateMarkerIcon(settings);
         return marker;
     }