diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts
index 51fdef7075..b67925038c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts
@@ -249,10 +249,11 @@ export function parseData(input: DatasourceData[]): FormattedData[] {
         deviceType: null
       };
       entityArray.filter(el => el.data.length).forEach(el => {
-        obj[el?.dataKey?.label] = el?.data[0][0] ? el?.data[0][1] : null;
-        obj[el?.dataKey?.label + '|ts'] = el?.data[0][0] || null;
+        const indexDate = el?.data?.length ? el.data.length - 1 : 0;
+        obj[el?.dataKey?.label] = el?.data[indexDate][0] ? el?.data[indexDate][1] : null;
+        obj[el?.dataKey?.label + '|ts'] = el?.data[indexDate][0] || null;
         if (el?.dataKey?.label === 'type') {
-          obj.deviceType = el?.data[0][1];
+          obj.deviceType = el?.data[indexDate][1];
         }
       });
       return obj;