From ed5f36a4c9a71c6201be8f26974bd96028520937 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Fri, 19 Mar 2021 16:48:05 +0200
Subject: [PATCH] Fix latest subscription reconnect handling

---
 ui-ngx/src/app/core/api/entity-data-subscription.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/api/entity-data-subscription.ts b/ui-ngx/src/app/core/api/entity-data-subscription.ts
index c6f8121919..9c769f3777 100644
--- a/ui-ngx/src/app/core/api/entity-data-subscription.ts
+++ b/ui-ngx/src/app/core/api/entity-data-subscription.ts
@@ -277,7 +277,11 @@ export class EntityDataSubscription {
               dataAggregator.reset(newSubsTw);
             });
           }
-          this.subscriber.setTsOffset(this.subsTw.tsOffset);
+          if (this.entityDataSubscriptionOptions.type === widgetType.timeseries) {
+            this.subscriber.setTsOffset(this.subsTw.tsOffset);
+          } else {
+            this.subscriber.setTsOffset(this.latestTsOffset);
+          }
           targetCommand.query = this.dataCommand.query;
           this.subscriber.subscriptionCommands = [targetCommand];
         } else {