diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts index b386592b3d..c6ffd407b1 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts @@ -32,6 +32,9 @@ export class UmbObserver { wantedToClose = true; } else { subscription.unsubscribe(); + if (!this.#callback) { + this.destroy(); + } } resolve(value as Exclude); } @@ -39,6 +42,9 @@ export class UmbObserver { initialCallback = false; if (wantedToClose) { subscription.unsubscribe(); + if (!this.#callback) { + this.destroy(); + } } }); }