From 171ea8422ddeb50be196e633c5d1a3cb5d8e4763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 5 Nov 2024 16:25:42 +0100
Subject: [PATCH] remove event listener

---
 .../src/libs/context-api/provide/context-provider.ts            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts
index 31f62cdc8e..61d8f461b4 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts
@@ -103,6 +103,8 @@ export class UmbContextProvider<BaseType = unknown, ResultType extends BaseType
 
 	destroy(): void {
 		this.hostDisconnected();
+		// Note we are not removing the event listener in the hostDisconnected, therefor we do it here [NL].
+		this.#eventTarget?.removeEventListener(UMB_CONTENT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
 		// We want to call a destroy method on the instance, if it has one.
 		(this.#instance as any)?.destroy?.();
 		this.#instance = undefined;