diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java b/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
index 617cec1..d0fd5c0 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
@@ -187,6 +187,9 @@ public class McpAsyncClient {
 		// Request Handlers
 		Map<String, RequestHandler<?>> requestHandlers = new HashMap<>();
 
+		// Ping MUST respond with an empty data, but not NULL response.
+		requestHandlers.put(McpSchema.METHOD_PING, params -> Mono.just(Map.of()));
+
 		// Roots List Request Handler
 		if (this.clientCapabilities.roots() != null) {
 			requestHandlers.put(McpSchema.METHOD_ROOTS_LIST, rootsListRequestHandler());
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java
index a79bdf6..3e89c8c 100644
--- a/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java
+++ b/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java
@@ -525,4 +525,30 @@ class McpAsyncClientResponseHandlerTests {
 			.hasMessage("Elicitation handler must not be null when client capabilities include elicitation");
 	}
 
-}
+	@Test
+	void testPingMessageRequestHandling() {
+		MockMcpClientTransport transport = initializationEnabledTransport();
+
+		McpAsyncClient asyncMcpClient = McpClient.async(transport).build();
+
+		assertThat(asyncMcpClient.initialize().block()).isNotNull();
+
+		// Simulate incoming ping request from server
+		McpSchema.JSONRPCRequest pingRequest = new McpSchema.JSONRPCRequest(McpSchema.JSONRPC_VERSION,
+				McpSchema.METHOD_PING, "ping-id", null);
+		transport.simulateIncomingMessage(pingRequest);
+
+		// Verify response
+		McpSchema.JSONRPCMessage sentMessage = transport.getLastSentMessage();
+		assertThat(sentMessage).isInstanceOf(McpSchema.JSONRPCResponse.class);
+
+		McpSchema.JSONRPCResponse response = (McpSchema.JSONRPCResponse) sentMessage;
+		assertThat(response.id()).isEqualTo("ping-id");
+		assertThat(response.error()).isNull();
+		assertThat(response.result()).isInstanceOf(Map.class);
+		assertThat(((Map<?, ?>) response.result())).isEmpty();
+
+		asyncMcpClient.closeGracefully();
+	}
+
+}
\ No newline at end of file