--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -1566,17 +1566,17 @@ this.Extension = class extends Extension
       this.policy.active = false;
 
       return this.cleanupGeneratedFile();
     }
 
     GlobalManager.uninit(this);
 
     for (let obj of this.onShutdown) {
-      obj.close();
+      obj.close(this);
     }
 
     for (let api of this.apis) {
       api.destroy();
     }
 
     ParentAPIManager.shutdownExtension(this.id);
 

--- a/toolkit/components/extensions/ExtensionCommon.jsm
+++ b/toolkit/components/extensions/ExtensionCommon.jsm
@@ -501,17 +501,17 @@ class BaseContext {
     this.unloaded = true;
 
     MessageChannel.abortResponses({
       extensionId: this.extension.id,
       contextId: this.contextId,
     });
 
     for (let obj of this.onClose) {
-      obj.close();
+      obj.close(this);
     }
   }
 
   /**
    * A simple proxy for unload(), for use with callOnClose().
    */
   close() {
     this.unload();