diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
index 42daf5f6ff..5e68ac8dc9 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
@@ -160,8 +160,6 @@
         <ng-container formGroupName="realtime" *ngIf="timewindow.selectedTab === timewindowTypes.REALTIME">
           <tb-timeinterval
             formControlName="interval"
-            [isEdit]="isEdit"
-            [(hideFlag)]="timewindow.hideAggInterval"
             [min]="minRealtimeAggInterval()" [max]="maxRealtimeAggInterval()"
             useCalendarIntervals
             subscriptSizing="dynamic"
@@ -171,8 +169,6 @@
         <ng-container formGroupName="history" *ngIf="timewindow.selectedTab === timewindowTypes.HISTORY">
           <tb-timeinterval
             formControlName="interval"
-            [isEdit]="isEdit"
-            [(hideFlag)]="timewindow.hideAggInterval"
             [min]="minHistoryAggInterval()" [max]="maxHistoryAggInterval()"
             useCalendarIntervals
             subscriptSizing="dynamic"
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 2cf7f0f22b..9f5718a018 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
@@ -156,7 +156,10 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
           value: isDefined(realtime?.timewindowMs) ? this.timewindow.realtime.timewindowMs : null,
           disabled: hideInterval || hideLastInterval
         }],
-        interval: [isDefined(realtime?.interval) ? this.timewindow.realtime.interval : null],
+        interval: [{
+          value:isDefined(realtime?.interval) ? this.timewindow.realtime.interval : null,
+          disabled: hideAggInterval
+        }],
         quickInterval: [{
           value: isDefined(realtime?.quickInterval) ? this.timewindow.realtime.quickInterval : null,
           disabled: hideInterval || hideQuickInterval
@@ -171,8 +174,10 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
           value: isDefined(history?.timewindowMs) ? this.timewindow.history.timewindowMs : null,
           disabled: hideInterval
         }],
-        interval: [ isDefined(history?.interval) ? this.timewindow.history.interval : null
-        ],
+        interval: [{
+          value:isDefined(history?.interval) ? this.timewindow.history.interval : null,
+          disabled: hideAggInterval
+        }],
         fixedTimewindow: [{
           value: isDefined(history?.fixedTimewindow) ? this.timewindow.history.fixedTimewindow : null,
           disabled: hideInterval
@@ -406,8 +411,12 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
   onHideAggIntervalChanged() {
     if (this.timewindow.hideAggInterval) {
       this.timewindowForm.get('aggregation.limit').disable({emitEvent: false});
+      this.timewindowForm.get('realtime.interval').disable({emitEvent: false});
+      this.timewindowForm.get('history.interval').disable({emitEvent: false});
     } else {
       this.timewindowForm.get('aggregation.limit').enable({emitEvent: false});
+      this.timewindowForm.get('realtime.interval').enable({emitEvent: false});
+      this.timewindowForm.get('history.interval').enable({emitEvent: false});
     }
     this.timewindowForm.markAsDirty();
   }