diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
index ed267ba4..3562ffa5 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
@@ -69,7 +69,7 @@ class ChannelOwner extends LoggingSupport {
   }
 
   <T> T withWaitLogging(String apiName, Supplier<T> code) {
-    return withLogging(apiName, new WaitForEventLogger<>(this, apiName, code));
+    return new WaitForEventLogger<>(this, apiName, code).get();
   }
 
   @Override
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
index 39477f74..edeeeeee 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
@@ -781,7 +781,10 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
   @Override
   public void waitForLoadState(LoadState state, WaitForLoadStateOptions options) {
-    withLogging("Frame.waitForLoadState", () -> waitForLoadStateImpl(state, options));
+    withWaitLogging("Frame.waitForLoadState", () -> {
+      waitForLoadStateImpl(state, options);
+      return null;
+    });
   }
 
   void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options) {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
index dd265550..ace2f984 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -1221,8 +1221,10 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public void waitForLoadState(LoadState state, WaitForLoadStateOptions options) {
-    withLogging("Page.waitForLoadState",
-      () -> mainFrame.waitForLoadStateImpl(state, convertViaJson(options, Frame.WaitForLoadStateOptions.class)));
+    withWaitLogging("Page.waitForLoadState", () -> {
+      mainFrame.waitForLoadStateImpl(state, convertViaJson(options, Frame.WaitForLoadStateOptions.class));
+      return null;
+    });
   }
 
   @Override
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java b/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java
index c18a324a..9ecf3404 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java
@@ -53,10 +53,10 @@ public class WaitForEventLogger<T> implements Supplier<T> {
   }
 
   private void sendWaitForEventInfo(JsonObject info) {
-    info.addProperty("apiName", apiName);
+    info.addProperty("event", "");
     info.addProperty("waitId", waitId);
     JsonObject params = new JsonObject();
     params.add("info", info);
-    channel.sendMessageAsync("waitForEventInfo", params);
+    channel.withLogging(apiName, () -> channel.sendMessageAsync("waitForEventInfo", params));
   }
 }