diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
index 46716a5e..81554346 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
@@ -34,7 +34,9 @@ class TracingImpl implements Tracing {
   private void export(Path path) {
     JsonObject json = context.sendMessage("tracingExport").getAsJsonObject();
     ArtifactImpl artifact = context.connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
-    if (context.browser().isRemote) {
+    // In case of CDP connection browser is null but since the connection is established by
+    // the driver it is safe to consider the artifact local.
+    if (context.browser() != null && context.browser().isRemote) {
       artifact.isRemote = true;
     }
     artifact.saveAs(path);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
index fab49e3d..48bd319f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
@@ -34,6 +34,7 @@ import java.nio.file.Paths;
 import java.util.*;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestBrowserTypeConnect extends TestBase {
@@ -456,4 +457,24 @@ public class TestBrowserTypeConnect extends TestBase {
     }
     page.close();
   }
+
+  @Test
+  void shouldSupportTracingOverWebSocket(@TempDir Path tempDir) throws IOException {
+    List<BrowserContext> contexts = browser.contexts();
+    assertEquals(1, contexts.size());
+    BrowserContext context = contexts.get(0);
+
+    Page page = context.newPage();
+    context.tracing().start(new Tracing.StartOptions().setName("test")
+      .setScreenshots(true).setSnapshots(true));
+    page.navigate(server.EMPTY_PAGE);
+    page.setContent("<button>Click</button>");
+    page.click("'Click'");
+    page.close();
+    Path traceFile = tempDir.resolve("trace.zip");
+    context.tracing().stop(new Tracing.StopOptions().setPath(traceFile));
+
+    assertTrue(Files.exists(traceFile));
+    assertTrue(Files.size(traceFile) > 0);
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestChromium.java b/playwright/src/test/java/com/microsoft/playwright/TestChromium.java
index 052fb71d..74d2d7f7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestChromium.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestChromium.java
@@ -20,6 +20,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,12 +28,13 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 
 import static com.microsoft.playwright.Utils.mapOf;
 import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 @EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Chromium-specific API")
 public class TestChromium extends TestBase {
@@ -41,7 +43,7 @@ public class TestChromium extends TestBase {
     // Do not create anything.
   }
 
-  private static int nextPort = 9339;
+  private int nextPort = 9339;
 
   private static String wsEndpointFromUrl(String urlString) throws IOException {
     URL url = new URL(urlString);
@@ -122,4 +124,30 @@ public class TestChromium extends TestBase {
       assertEquals("bar", webSocketServer.lastClientHandshake.getFieldValue("foo"));
     }
   }
+
+  @Test
+  void shouldSupportTracingOverCDP(@TempDir Path tempDir) throws IOException {
+    int port = nextPort++;
+    try (Browser browserServer = browserType.launch(createLaunchOptions()
+      .setArgs(asList("--remote-debugging-port=" + port)))) {
+      try (Browser cdpBrowser = browserType.connectOverCDP("http://localhost:" + port)) {
+        List<BrowserContext> contexts = cdpBrowser.contexts();
+        assertEquals(1, contexts.size());
+        BrowserContext context = contexts.get(0);
+
+        Page page = context.newPage();
+        context.tracing().start(new Tracing.StartOptions().setName("test")
+          .setScreenshots(true).setSnapshots(true));
+        page.navigate(server.EMPTY_PAGE);
+        page.setContent("<button>Click</button>");
+        page.click("'Click'");
+        page.close();
+        Path traceFile = tempDir.resolve("trace.zip");
+        context.tracing().stop(new Tracing.StopOptions().setPath(traceFile));
+
+        assertTrue(Files.exists(traceFile));
+        assertTrue(Files.size(traceFile) > 0);
+      }
+    }
+  }
 }