diff --git a/contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java b/contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java
index 80c25610d..ca7289714 100644
--- a/contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java
+++ b/contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java
@@ -524,6 +524,9 @@ private List<Part> toParts(AiMessage aiMessage) {
               });
       return parts;
     } else {
+      if (aiMessage.text() == null) {
+        return List.of();
+      }
       Part part = Part.builder().text(aiMessage.text()).build();
       return List.of(part);
     }
diff --git a/contrib/langchain4j/src/test/java/com/google/adk/models/langchain4j/LangChain4jTest.java b/contrib/langchain4j/src/test/java/com/google/adk/models/langchain4j/LangChain4jTest.java
index 428a5660c..5bfa21563 100644
--- a/contrib/langchain4j/src/test/java/com/google/adk/models/langchain4j/LangChain4jTest.java
+++ b/contrib/langchain4j/src/test/java/com/google/adk/models/langchain4j/LangChain4jTest.java
@@ -688,4 +688,28 @@ void testGenerateContentWithStructuredResponseJsonSchema() {
     final UserMessage userMessage = (UserMessage) capturedRequest.messages().get(0);
     assertThat(userMessage.singleText()).isEqualTo("Give me information about John Doe");
   }
+
+  @Test
+  @DisplayName("Should handle null AiMessage text without throwing NPE")
+  void testGenerateContentWithNullAiMessageText() {
+    // Given
+    final LlmRequest llmRequest =
+        LlmRequest.builder().contents(List.of(Content.fromParts(Part.fromText("Hello")))).build();
+
+    final ChatResponse chatResponse = mock(ChatResponse.class);
+    final AiMessage aiMessage = mock(AiMessage.class);
+    when(aiMessage.text()).thenReturn(null);
+    when(aiMessage.hasToolExecutionRequests()).thenReturn(false);
+    when(chatResponse.aiMessage()).thenReturn(aiMessage);
+    when(chatModel.chat(any(ChatRequest.class))).thenReturn(chatResponse);
+
+    // When
+    final Flowable<LlmResponse> responseFlowable = langChain4j.generateContent(llmRequest, false);
+    final LlmResponse response = responseFlowable.blockingFirst();
+
+    // Then - no NPE thrown, and content has no text parts
+    assertThat(response).isNotNull();
+    assertThat(response.content()).isPresent();
+    assertThat(response.content().get().parts().orElse(List.of())).isEmpty();
+  }
 }