diff --git a/packages/playwright-core/src/client/channelOwner.ts b/packages/playwright-core/src/client/channelOwner.ts
index 4b40ffd039..34c7ab7b04 100644
--- a/packages/playwright-core/src/client/channelOwner.ts
+++ b/packages/playwright-core/src/client/channelOwner.ts
@@ -26,8 +26,9 @@ import { zones } from '../utils/zones';
 import type { ClientInstrumentation } from './clientInstrumentation';
 import type { Connection } from './connection';
 import type { Logger } from './types';
+import { JoiningEventEmitter } from './joiningEventEmitter';
 
-export abstract class ChannelOwner<T extends channels.Channel = channels.Channel> extends EventEmitter {
+export abstract class ChannelOwner<T extends channels.Channel = channels.Channel> extends JoiningEventEmitter {
   readonly _connection: Connection;
   private _parent: ChannelOwner | undefined;
   private _objects = new Map<string, ChannelOwner>();
diff --git a/packages/playwright-core/src/client/joiningEventEmitter.ts b/packages/playwright-core/src/client/joiningEventEmitter.ts
new file mode 100644
index 0000000000..ee916da8c5
--- /dev/null
+++ b/packages/playwright-core/src/client/joiningEventEmitter.ts
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the 'License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { EventEmitter } from 'events';
+import { MultiMap } from '../utils/multimap';
+
+const originalListener = Symbol('originalListener');
+const wrapperListener = Symbol('wrapperListener');
+
+export class JoiningEventEmitter implements EventEmitter {
+  private _emitterDelegate = new EventEmitter();
+  private _pendingPromises = new MultiMap<string | symbol, Promise<void>>();
+
+  addListener(event: string | symbol, listener: (...args: any[]) => void): this {
+    this._emitterDelegate.addListener(event, this._wrap(event, listener));
+    return this;
+  }
+
+  on(event: string | symbol, listener: (...args: any[]) => void): this {
+    this._emitterDelegate.on(event, this._wrap(event, listener));
+    return this;
+  }
+
+  once(event: string | symbol, listener: (...args: any[]) => void): this {
+    const onceWrapper = (...args: any) => {
+      listener(...args);
+      this.off(event, onceWrapper);
+    };
+    this.on(event, onceWrapper);
+    return this;
+  }
+
+  removeListener(event: string | symbol, listener: (...args: any[]) => void): this {
+    this._emitterDelegate.removeListener(event, this._wrapper(listener));
+    return this;
+  }
+
+  off(event: string | symbol, listener: (...args: any[]) => void): this {
+    this._emitterDelegate.off(event, this._wrapper(listener));
+    return this;
+  }
+
+  removeAllListeners(event?: string | symbol | undefined): this {
+    this._emitterDelegate.removeAllListeners();
+    return this;
+  }
+
+  setMaxListeners(n: number): this {
+    this._emitterDelegate.setMaxListeners(n);
+    return this;
+  }
+
+  getMaxListeners(): number {
+    return this._emitterDelegate.getMaxListeners();
+  }
+
+  listeners(event: string | symbol): Function[] {
+    return this._emitterDelegate.listeners(event).map(f => this._original(f));
+  }
+
+  rawListeners(event: string | symbol): Function[] {
+    return this._emitterDelegate.rawListeners(event).map(f => this._original(f));
+  }
+
+  emit(event: string | symbol, ...args: any[]): boolean {
+    return this._emitterDelegate.emit(event, ...args);
+  }
+
+  listenerCount(event: string | symbol): number {
+    return this._emitterDelegate.listenerCount(event);
+  }
+
+  prependListener(event: string | symbol, listener: (...args: any[]) => void): this {
+    this._emitterDelegate.prependListener(event, this._wrap(event, listener));
+    return this;
+  }
+
+  prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this {
+    const onceWrapper = (...args: any) => {
+      listener(...args);
+      this.off(event, onceWrapper);
+    };
+    this.prependListener(event, onceWrapper);
+    return this;
+  }
+
+  eventNames(): (string | symbol)[] {
+    return this._emitterDelegate.eventNames();
+  }
+
+  async _joinPendingEventHandlers() {
+    await Promise.all([...this._pendingPromises.values()]);
+  }
+
+  private _wrap(event: string | symbol, listener: (...args: any[]) => void) {
+    const wrapper = (...args: any) => {
+      const result = listener(...args) as any;
+      if (result instanceof Promise) {
+        this._pendingPromises.set(event, result);
+        result.finally(() => this._pendingPromises.delete(event, result));
+      }
+    };
+    (wrapper as any)[originalListener] = listener;
+    (listener as any)[wrapperListener] = wrapper;
+    return wrapper;
+  }
+
+  private _wrapper(listener: (...args: any[]) => void) {
+    return (listener as any)[wrapperListener];
+  }
+
+  private _original(wrapper: Function): Function {
+    return (wrapper as any)[originalListener];
+  }
+}
diff --git a/packages/playwright-core/src/utils/multimap.ts b/packages/playwright-core/src/utils/multimap.ts
index 5c671fcc48..bf9e2870a0 100644
--- a/packages/playwright-core/src/utils/multimap.ts
+++ b/packages/playwright-core/src/utils/multimap.ts
@@ -38,6 +38,15 @@ export class MultiMap<K, V> {
     return this._map.has(key);
   }
 
+  delete(key: K, value: V) {
+    const values = this._map.get(key);
+    if (!values)
+      return;
+    if (values.includes(value))
+      this._map.set(key, values.filter(v => value !== v));
+  }
+
+
   hasValue(key: K, value: V): boolean {
     const values = this._map.get(key);
     if (!values)