diff --git a/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java b/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java
index ec05c2616..25d098853 100644
--- a/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java
+++ b/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java
@@ -126,8 +126,7 @@ public static Builder builder() {
         .enabled(true)
         .maxContentLength(500 * 1024)
         .location("us") // Default location.
-        .datasetId("agent_analytics")
-        .tableName("events")
+        .tableName("agent_analytics")
         .clusteringFields(ImmutableList.of("event_type", "agent", "user_id"))
         .logMultiModalContent(true)
         .gcsBucketName("")
diff --git a/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfigTest.java b/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfigTest.java
index 2a4844627..0f3c752eb 100644
--- a/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfigTest.java
+++ b/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfigTest.java
@@ -27,7 +27,7 @@
 public class BigQueryLoggerConfigTest {
 
   private static BigQueryLoggerConfig.Builder validBuilder() {
-    return BigQueryLoggerConfig.builder().projectId("test-project");
+    return BigQueryLoggerConfig.builder().projectId("test-project").datasetId("test-dataset");
   }
 
   @Test