diff --git a/src/a2a/server/tasks/task_updater.py b/src/a2a/server/tasks/task_updater.py
index b62dedff..b5ed9725 100644
--- a/src/a2a/server/tasks/task_updater.py
+++ b/src/a2a/server/tasks/task_updater.py
@@ -68,7 +68,7 @@ async def update_status(
     async def add_artifact(
         self,
         parts: list[Part],
-        artifact_id: str = str(uuid.uuid4()),
+        artifact_id: str | None = None,
         name: str | None = None,
         metadata: dict[str, Any] | None = None,
     ):
@@ -82,6 +82,9 @@ async def add_artifact(
             append: Optional boolean indicating if this chunk appends to a previous one.
             last_chunk: Optional boolean indicating if this is the last chunk.
         """
+        if not artifact_id:
+            artifact_id = str(uuid.uuid4())
+
         await self.event_queue.enqueue_event(
             TaskArtifactUpdateEvent(
                 taskId=self.task_id,