diff --git a/src/a2a/utils/proto_utils.py b/src/a2a/utils/proto_utils.py
index d077d62b..8bf01eea 100644
--- a/src/a2a/utils/proto_utils.py
+++ b/src/a2a/utils/proto_utils.py
@@ -203,6 +203,7 @@ def task(cls, task: types.Task) -> a2a_pb2.Task:
                 if task.history
                 else None
             ),
+            metadata=cls.metadata(task.metadata),
         )
 
     @classmethod
@@ -660,6 +661,7 @@ def task(cls, task: a2a_pb2.Task) -> types.Task:
             status=cls.task_status(task.status),
             artifacts=[cls.artifact(a) for a in task.artifacts],
             history=[cls.message(h) for h in task.history],
+            metadata=cls.metadata(task.metadata),
         )
 
     @classmethod
diff --git a/tests/utils/test_proto_utils.py b/tests/utils/test_proto_utils.py
index da54f833..33be1f3f 100644
--- a/tests/utils/test_proto_utils.py
+++ b/tests/utils/test_proto_utils.py
@@ -52,6 +52,7 @@ def sample_task(sample_message: types.Message) -> types.Task:
                 ],
             )
         ],
+        metadata={'source': 'test'},
     )
 
 
@@ -508,3 +509,30 @@ def test_large_integer_roundtrip_with_utilities(self):
         assert final_result['nested']['another_large'] == 12345678901234567890
         assert isinstance(final_result['nested']['another_large'], int)
         assert final_result['nested']['normal'] == 'text'
+
+    def test_task_conversion_roundtrip(
+        self, sample_task: types.Task, sample_message: types.Message
+    ):
+        """Test conversion of Task to proto and back."""
+        proto_task = proto_utils.ToProto.task(sample_task)
+        assert isinstance(proto_task, a2a_pb2.Task)
+
+        roundtrip_task = proto_utils.FromProto.task(proto_task)
+        assert roundtrip_task.id == 'task-1'
+        assert roundtrip_task.context_id == 'ctx-1'
+        assert roundtrip_task.status == types.TaskStatus(
+            state=types.TaskState.working, message=sample_message
+        )
+        assert roundtrip_task.history == [sample_message]
+        assert roundtrip_task.artifacts == [
+            types.Artifact(
+                artifact_id='art-1',
+                description='',
+                metadata={},
+                name='',
+                parts=[
+                    types.Part(root=types.TextPart(text='Artifact content'))
+                ],
+            )
+        ]
+        assert roundtrip_task.metadata == {'source': 'test'}