diff --git a/projects/common/components/geometry/geometry.component.ts b/projects/common/components/geometry/geometry.component.ts
index b030b2068ef325b39b2ef051d9c2a1700019df96..45207c147bb61ff57920cb58b1b0b5d21b68d056 100644
--- a/projects/common/components/geometry/geometry.component.ts
+++ b/projects/common/components/geometry/geometry.component.ts
@@ -51,7 +51,10 @@ export class GeometryComponent extends ElementComponent implements AfterViewInit
               private externalResourceService: ExternalResourceService) {
     super(elementRef);
     this.externalResourceService.initializeGeoGebra(this.renderer);
-    this.pageChangeSubscription = pageChangeService.pageChanged.subscribe(() => this.loadApplet());
+    this.pageChangeSubscription = pageChangeService.pageChanged
+      .pipe(
+        takeUntil(this.ngUnsubscribe)
+      ).subscribe(() => this.loadApplet());
     this.geometryUpdated
       .pipe(
         debounceTime(500),