angular
diff --git a/‎packages/core/src/application_ref.ts
Copy file name to clipboardExpand all lines: packages/core/src/application_ref.ts
+11-6Lines changed: 11 additions & 6 deletions b/‎packages/core/src/application_ref.ts
Copy file name to clipboardExpand all lines: packages/core/src/application_ref.ts
+11-6Lines changed: 11 additions & 6 deletions
diff --git a/‎packages/core/test/acceptance/bootstrap_spec.ts
Copy file name to clipboardExpand all lines: packages/core/test/acceptance/bootstrap_spec.ts
+18-2Lines changed: 18 additions & 2 deletions b/‎packages/core/test/acceptance/bootstrap_spec.ts
Copy file name to clipboardExpand all lines: packages/core/test/acceptance/bootstrap_spec.ts
+18-2Lines changed: 18 additions & 2 deletions
@@ -328,12 +328,17 @@ export class PlatformRef {
       if (!exceptionHandler) {
         throw new Error('No ErrorHandler. Is platform module (BrowserModule) included?');
       }
-      moduleRef.onDestroy(() => remove(this._modules, moduleRef));
-      ngZone!.runOutsideAngular(() => ngZone!.onError.subscribe({
-        next: (error: any) => {
-          exceptionHandler.handleError(error);
-        }
-      }));
+      ngZone!.runOutsideAngular(() => {
+        const subscription = ngZone!.onError.subscribe({
+          next: (error: any) => {
+            exceptionHandler.handleError(error);
+          }
+        });
+        moduleRef.onDestroy(() => {
+          remove(this._modules, moduleRef);
+          subscription.unsubscribe();
+        });
+      });
       return _callAndReportToErrorHandler(exceptionHandler, ngZone!, () => {
         const initStatus: ApplicationInitStatus = moduleRef.injector.get(ApplicationInitStatus);
         initStatus.runInitializers();
 
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationRef, COMPILER_OPTIONS, Component, destroyPlatform, NgModule, TestabilityRegistry, ViewEncapsulation} from '@angular/core';
+import {ApplicationRef, COMPILER_OPTIONS, Component, destroyPlatform, NgModule, NgZone, TestabilityRegistry, ViewEncapsulation} from '@angular/core';
 import {expect} from '@angular/core/testing/src/testing_internal';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
@@ -227,6 +227,22 @@ describe('bootstrap', () => {
          }));
     });
 
+    describe('PlatformRef cleanup', () => {
+      it('should unsubscribe from `onError` when Injector is destroyed',
+         withBody('<my-app></my-app>', async () => {
+           const TestModule = createComponentAndModule();
+
+           const ngModuleRef = await platformBrowserDynamic().bootstrapModule(TestModule);
+           const ngZone = ngModuleRef.injector.get(NgZone);
+
+           expect(ngZone.onError.observers.length).toBe(1);
+
+           ngModuleRef.destroy();
+
+           expect(ngZone.onError.observers.length).toBe(0);
+         }));
+    });
+
     onlyInIvy('options cannot be changed in Ivy').describe('changing bootstrap options', () => {
       beforeEach(() => {
         spyOn(console, 'error');
@@ -365,4 +381,4 @@ export class MultipleSelectorsAppComponent {
   bootstrap: [MultipleSelectorsAppComponent],
 })
 export class MultipleSelectorsAppModule {
-}
+}