diff --git a/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java b/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java
index 97cc0f56d..0c2b33704 100644
--- a/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java
+++ b/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java
@@ -73,7 +73,7 @@ static String convertEventToJson(Event event, boolean useIsoString) {
     event.turnComplete().ifPresent(v -> metadataJson.put("turnComplete", v));
     event.interrupted().ifPresent(v -> metadataJson.put("interrupted", v));
     event.branch().ifPresent(v -> metadataJson.put("branch", v));
-    putIfNotEmpty(metadataJson, "longRunningToolIds", event.longRunningToolIds());
+    event.longRunningToolIds().ifPresent(v -> putIfNotEmpty(metadataJson, "longRunningToolIds", v));
     event.groundingMetadata().ifPresent(v -> metadataJson.put("groundingMetadata", v));
     event.usageMetadata().ifPresent(v -> metadataJson.put("usageMetadata", v));
     Map<String, Object> eventJson = new HashMap<>();
@@ -355,11 +355,6 @@ private static void putIfNotEmpty(Map<String, Object> map, String key, Map<?, ?>
     }
   }
 
-  private static void putIfNotEmpty(
-      Map<String, Object> map, String key, Optional<? extends Collection<?>> values) {
-    values.ifPresent(v -> putIfNotEmpty(map, key, v));
-  }
-
   private static void putIfNotEmpty(
       Map<String, Object> map, String key, @Nullable Collection<?> values) {
     if (values != null && !values.isEmpty()) {