diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts
index a344e93683..dafda75c0b 100644
--- a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts
+++ b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts
@@ -62,9 +62,9 @@ export class DebugSettingsButtonComponent implements ControlValueAccessor {
   disabled = false;
 
   isDebugAllActive$ = this.debugSettingsFormGroup.get('allEnabled').valueChanges.pipe(
-    startWith(this.debugSettingsFormGroup.get('allEnabled').value),
-    switchMap(value => {
-      if (value) {
+    startWith(null),
+    switchMap(() => {
+      if (this.allEnabled) {
         return of(true);
       } else {
         return timer(0, SECOND).pipe(
@@ -79,7 +79,7 @@ export class DebugSettingsButtonComponent implements ControlValueAccessor {
 
   readonly maxDebugModeDurationMinutes = getCurrentAuthState(this.store).maxDebugModeDurationMinutes;
 
-  private propagateChange: (settings: DebugSettings) => void;
+  private propagateChange: (settings: DebugSettings) => void = () => {};
 
   constructor(private popoverService: TbPopoverService,
               private renderer: Renderer2,
diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts
index e52f711583..a9e237245c 100644
--- a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts
@@ -121,6 +121,7 @@ export class DebugSettingsPanelComponent extends PageComponent implements OnInit
       this.onSettingsApplied.emit({
         allEnabled: false,
         failuresEnabled: this.onFailuresControl.value,
+        allEnabledUntil: this.allEnabledUntil,
       });
     }
   }