diff --git a/src/a2a/server/request_handlers/default_request_handler.py b/src/a2a/server/request_handlers/default_request_handler.py
index 30d1ee89..e1d34455 100644
--- a/src/a2a/server/request_handlers/default_request_handler.py
+++ b/src/a2a/server/request_handlers/default_request_handler.py
@@ -346,7 +346,10 @@ async def push_notification_callback() -> None:
 
         if isinstance(result, Task):
             self._validate_task_id_match(task_id, result.id)
-            if params.configuration:
+            if (
+                params.configuration
+                and params.configuration.history_length is not None
+            ):
                 result = apply_history_length(
                     result, params.configuration.history_length
                 )
diff --git a/tests/server/request_handlers/test_default_request_handler.py b/tests/server/request_handlers/test_default_request_handler.py
index 5268af11..a7932629 100644
--- a/tests/server/request_handlers/test_default_request_handler.py
+++ b/tests/server/request_handlers/test_default_request_handler.py
@@ -875,6 +875,45 @@ async def test_on_message_send_limit_history():
     assert task.history is not None and len(task.history) > 0
 
 
+@pytest.mark.asyncio
+async def test_on_message_send_limit_history_non_as_no_limit():
+    task_store = InMemoryTaskStore()
+    push_store = InMemoryPushNotificationConfigStore()
+
+    request_handler = DefaultRequestHandler(
+        agent_executor=HelloAgentExecutor(),
+        task_store=task_store,
+        push_config_store=push_store,
+    )
+    params = MessageSendParams(
+        message=Message(
+            role=Role.user,
+            message_id='msg_push',
+            parts=[Part(root=TextPart(text='Hi'))],
+        ),
+        configuration=MessageSendConfiguration(
+            blocking=True,
+            accepted_output_modes=['text/plain'],
+            history_length=None,
+        ),
+    )
+
+    result = await request_handler.on_message_send(
+        params, create_server_call_context()
+    )
+
+    # verify that history_length is honored
+    assert result is not None
+    assert isinstance(result, Task)
+    assert result.history is not None and len(result.history) > 0
+    assert result.status.state == TaskState.completed
+
+    # verify that history is still persisted to the store
+    task = await task_store.get(result.id)
+    assert task is not None
+    assert task.history is not None and len(task.history) > 0
+
+
 @pytest.mark.asyncio
 async def test_on_task_get_limit_history():
     task_store = InMemoryTaskStore()