diff --git a/src/Playwright/Core/Waiter.cs b/src/Playwright/Core/Waiter.cs
index c5128d035..7178163bd 100644
--- a/src/Playwright/Core/Waiter.cs
+++ b/src/Playwright/Core/Waiter.cs
@@ -172,7 +172,7 @@ internal Task<object> WaitForEventAsync(object eventSource, string e)
     {
         var info = eventSource.GetType().GetEvent(e) ?? eventSource.GetType().BaseType.GetEvent(e);
 
-        var eventTsc = new TaskCompletionSource<T>();
+        var eventTsc = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
         void EventHandler(object sender, T e)
         {
             try