diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
index 83568b8b9a..4254b2d765 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
@@ -183,14 +183,14 @@ export class MapWidgetController implements MapWidgetInterface {
                 }
             }
         });
-        if (attributes.length) {
+        if (timeseries.length) {
             attributeService.saveEntityTimeseries(
                 entityId,
                 LatestTelemetry.LATEST_TELEMETRY,
                 timeseries
             ).subscribe(() => { });
         }
-        if (timeseries.length) {
+        if (attributes.length) {
             attributeService.saveEntityAttributes(
                 entityId,
                 AttributeScope.SERVER_SCOPE,