diff --git a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
index 5fef4b832e..1cd44652a9 100644
--- a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
+++ b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
@@ -204,7 +204,7 @@ export class EntityDataCmd implements WebsocketCmd {
   aggTsCmd?: AggTimeSeriesCmd;
 
   public isEmpty(): boolean {
-    return !this.query && !this.historyCmd && !this.latestCmd && !this.tsCmd;
+    return !this.query && !this.historyCmd && !this.latestCmd && !this.tsCmd && !this.aggTsCmd && !this.aggHistoryCmd;
   }
 }