diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
index 0142adeb25..c5829c8e79 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
@@ -154,6 +154,7 @@ export class ModalComponent implements OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.toggle(false);
     this.destroy$.next();
   }