diff --git a/devtools/projects/shell-browser/src/app/chrome-message-bus.ts b/devtools/projects/shell-browser/src/app/chrome-message-bus.ts
index 747d69cac9c..efe511876e2 100644
--- a/devtools/projects/shell-browser/src/app/chrome-message-bus.ts
+++ b/devtools/projects/shell-browser/src/app/chrome-message-bus.ts
@@ -80,7 +80,7 @@ export class ChromeMessageBus extends MessageBus<Events> {
   }
 
   override destroy(): void {
-    this._listeners.forEach((l) => window.removeEventListener('message', l));
+    this._listeners.forEach((l) => this._port.onMessage.removeListener(l));
     this._listeners = [];
   }
 }