diff --git a/src/Umbraco.Web.UI.Client/src/core/context/context-inject.mixin.ts b/src/Umbraco.Web.UI.Client/src/core/context/context-inject.mixin.ts index 3060cb580f..0ffdbc030d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context/context-inject.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context/context-inject.mixin.ts @@ -15,11 +15,12 @@ export function UmbContextInjectMixin(Base: TBase) { * @param {string} contextKey */ requestContext(contextKey: string) { - if (this._requesters.has(contextKey)) { - return; - } + if (this._requesters.has(contextKey)) return; const requester = new UmbContextRequester(this, contextKey, (_instance: any) => { + // don't to anything if the context is already resolved + if (this._resolved.has(contextKey) && this._resolved.get(contextKey) === _instance) return; + this._resolved.set(contextKey, _instance); this.contextInjected(this._resolved); });