diff --git a/blocks/UploadCtxProvider/UploadCtxProvider.js b/blocks/UploadCtxProvider/UploadCtxProvider.js index f50d5233f..a16e9ea63 100644 --- a/blocks/UploadCtxProvider/UploadCtxProvider.js +++ b/blocks/UploadCtxProvider/UploadCtxProvider.js @@ -13,7 +13,10 @@ class UploadCtxProviderClass extends UploaderBlock { destroyCallback() { super.destroyCallback(); - this.$['*eventEmitter'].unbindTarget(this); + if (this.has('*eventEmitter')) { + // Context could be destroyed before the block destroy callback called + this.$['*eventEmitter'].unbindTarget(this); + } } }