diff --git a/angular/test/test-app/e2e/src/form.spec.ts b/angular/test/test-app/e2e/src/form.spec.ts
index cc3fddbd54e..165ae68b103 100644
--- a/angular/test/test-app/e2e/src/form.spec.ts
+++ b/angular/test/test-app/e2e/src/form.spec.ts
@@ -39,6 +39,9 @@ describe('Form', () => {
       cy.get('ion-input.required').invoke('prop', 'value', 'Some value');
       testStatus('INVALID');
 
+      // TODO: FW-1160 - Remove when v7 is released
+      cy.wait(300);
+
       cy.get('ion-select').invoke('prop', 'value', 'nes');
       testStatus('INVALID');
 
diff --git a/core/src/components/select/select.tsx b/core/src/components/select/select.tsx
index bf8b148e87a..54906739099 100644
--- a/core/src/components/select/select.tsx
+++ b/core/src/components/select/select.tsx
@@ -150,6 +150,7 @@ export class Select implements ComponentInterface {
   @Watch('value')
   valueChanged() {
     this.emitStyle();
+    // TODO: FW-1160 - Remove the `didInit` property when ionChange behavior is changed in v7.
     if (this.didInit) {
       this.ionChange.emit({
         value: this.value,