diff --git a/src/app/features/config/config-sound-form/config-sound-form.component.ts b/src/app/features/config/config-sound-form/config-sound-form.component.ts
index aa494d4c5..32a0e6202 100644
--- a/src/app/features/config/config-sound-form/config-sound-form.component.ts
+++ b/src/app/features/config/config-sound-form/config-sound-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, output } from '@angular/core';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { GlobalConfigSectionKey, SoundConfig } from '../global-config.model';
 import { ProjectCfgFormKey } from '../../project/project.model';
@@ -23,6 +23,7 @@ const sectionKey = 'sound';
   selector: 'config-sound-form',
   templateUrl: './config-sound-form.component.html',
   styleUrls: ['./config-sound-form.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     CollapsibleComponent,
     FormsModule,
diff --git a/src/app/features/task-view-customizer/task-view-customizer-panel/task-view-customizer-panel.component.ts b/src/app/features/task-view-customizer/task-view-customizer-panel/task-view-customizer-panel.component.ts
index d77e24221..28b18e7e1 100644
--- a/src/app/features/task-view-customizer/task-view-customizer-panel/task-view-customizer-panel.component.ts
+++ b/src/app/features/task-view-customizer/task-view-customizer-panel/task-view-customizer-panel.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -15,6 +15,7 @@ import { T } from 'src/app/t.const';
   selector: 'task-view-customizer-panel',
   templateUrl: './task-view-customizer-panel.component.html',
   styleUrls: ['./task-view-customizer-panel.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
     CommonModule,