diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
index 6b5d434102..2f0a1aa603 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
@@ -381,8 +381,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
       this.timewindowForm.valueChanges.pipe(
         takeUntil(this.destroy$)
       ).subscribe(() => {
-        this.prepareTimewindowConfig();
-        this.changeTimewindow.emit(this.clearTimewindowConfig());
+        this.changeTimewindow.emit(this.prepareTimewindowConfig());
       });
     }
   }
@@ -408,12 +407,11 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
   }
 
   update() {
-    this.prepareTimewindowConfig();
-    this.result = this.clearTimewindowConfig();
+    this.result = this.prepareTimewindowConfig();
     this.overlayRef?.dispose();
   }
 
-  private prepareTimewindowConfig() {
+  private prepareTimewindowConfig(clearConfig = true): Timewindow {
     const timewindowFormValue = this.timewindowForm.getRawValue();
     this.timewindow.selectedTab = timewindowFormValue.selectedTab;
     if (this.timewindow.selectedTab === TimewindowType.REALTIME) {
@@ -442,10 +440,12 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
     if (this.timezone) {
       this.timewindow.timezone = timewindowFormValue.timezone;
     }
-  }
 
-  private clearTimewindowConfig(): Timewindow {
-    return clearTimewindowConfig(this.timewindow, this.quickIntervalOnly, this.historyOnly, this.aggregation, this.timezone);
+    if (clearConfig) {
+      return clearTimewindowConfig(this.timewindow, this.quickIntervalOnly, this.historyOnly, this.aggregation, this.timezone);
+    } else {
+      return deepClone(this.timewindow);
+    }
   }
 
   private updateTimewindowForm() {
@@ -555,7 +555,6 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
   }
 
   openTimewindowConfig() {
-    this.prepareTimewindowConfig();
     this.dialog.open<TimewindowConfigDialogComponent, TimewindowConfigDialogData, Timewindow>(
       TimewindowConfigDialogComponent, {
         autoFocus: false,
@@ -564,7 +563,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
         data: {
           quickIntervalOnly: this.quickIntervalOnly,
           aggregation: this.aggregation,
-          timewindow: deepClone(this.timewindow)
+          timewindow: this.prepareTimewindowConfig(false)
         }
       }).afterClosed()
       .subscribe((res) => {
diff --git a/ui-ngx/src/app/shared/models/time/time.models.ts b/ui-ngx/src/app/shared/models/time/time.models.ts
index cace546b19..35ff3a0572 100644
--- a/ui-ngx/src/app/shared/models/time/time.models.ts
+++ b/ui-ngx/src/app/shared/models/time/time.models.ts
@@ -1132,12 +1132,12 @@ export const clearTimewindowConfig = (timewindow: Timewindow, quickIntervalOnly:
       delete timewindow.realtime.quickInterval;
     }
 
-    delete timewindow.history.historyType;
-    delete timewindow.history.timewindowMs;
-    delete timewindow.history.fixedTimewindow;
-    delete timewindow.history.quickInterval;
+    delete timewindow.history?.historyType;
+    delete timewindow.history?.timewindowMs;
+    delete timewindow.history?.fixedTimewindow;
+    delete timewindow.history?.quickInterval;
 
-    delete timewindow.history.interval;
+    delete timewindow.history?.interval;
     if (!hasAggregation) {
       delete timewindow.realtime.interval;
     }
@@ -1157,11 +1157,11 @@ export const clearTimewindowConfig = (timewindow: Timewindow, quickIntervalOnly:
       delete timewindow.history.quickInterval;
     }
 
-    delete timewindow.realtime.realtimeType;
-    delete timewindow.realtime.timewindowMs;
-    delete timewindow.realtime.quickInterval;
+    delete timewindow.realtime?.realtimeType;
+    delete timewindow.realtime?.timewindowMs;
+    delete timewindow.realtime?.quickInterval;
 
-    delete timewindow.realtime.interval;
+    delete timewindow.realtime?.interval;
     if (!hasAggregation) {
       delete timewindow.history.interval;
     }