diff --git a/ui-ngx/src/app/core/services/dashboard-utils.service.ts b/ui-ngx/src/app/core/services/dashboard-utils.service.ts
index b743126fdc..7101aa0a2e 100644
--- a/ui-ngx/src/app/core/services/dashboard-utils.service.ts
+++ b/ui-ngx/src/app/core/services/dashboard-utils.service.ts
@@ -296,9 +296,8 @@ export class DashboardUtilsService {
     }
     widgetConfig.datasources = this.validateAndUpdateDatasources(widgetConfig.datasources);
     if (type === widgetType.latest) {
-      const onlyHistoryTimewindow = datasourcesHasOnlyComparisonAggregation(widgetConfig.datasources);
-      const aggregationEnabledForKeys = datasourcesHasAggregation(widgetConfig.datasources);
-      if (aggregationEnabledForKeys) {
+      if (datasourcesHasAggregation(widgetConfig.datasources)) {
+        const onlyHistoryTimewindow = datasourcesHasOnlyComparisonAggregation(widgetConfig.datasources);
         widgetConfig.timewindow = initModelFromDefaultTimewindow(widgetConfig.timewindow, true,
           onlyHistoryTimewindow, this.timeService, false);
       }
@@ -356,7 +355,7 @@ export class DashboardUtilsService {
     return widgetConfig;
   }
 
-  public removeTimewindowConfigIfUnused(widgetConfig: WidgetConfig, type: widgetType) {
+  private removeTimewindowConfigIfUnused(widgetConfig: WidgetConfig, type: widgetType) {
     const widgetHasTimewindow = widgetTypeHasTimewindow(type) || (type === widgetType.latest && datasourcesHasAggregation(widgetConfig.datasources));
     if (!widgetHasTimewindow || widgetConfig.useDashboardTimewindow) {
       delete widgetConfig.displayTimewindow;
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index 9937689ba8..0c1b066887 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -197,7 +197,7 @@ export function deleteNullProperties(obj: any) {
   });
 }
 
-export function deleteFalseProperties(obj: any) {
+export function deleteFalseProperties(obj: Record<string, any>): void  {
   if (isUndefinedOrNull(obj)) {
     return;
   }