diff --git a/src/frequenz/client/reporting/_client.py b/src/frequenz/client/reporting/_client.py
index f34167f..cad819a 100644
--- a/src/frequenz/client/reporting/_client.py
+++ b/src/frequenz/client/reporting/_client.py
@@ -6,7 +6,7 @@
 from collections import namedtuple
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, AsyncIterator, Awaitable, Generator, Type, cast
+from typing import Any, AsyncIterator, Awaitable, Iterator, Type, cast
 
 import grpc.aio as grpcaio
 
@@ -58,7 +58,7 @@ def is_empty(self) -> bool:
             return True
         return False
 
-    def iterate_metric_samples(self) -> Generator[MetricSample, None, None]:
+    def __iter__(self) -> Iterator[MetricSample]:
         """Get generator that iterates over all values in the page.
 
         Note: So far only `SimpleMetricSample` in the `MetricSampleVariant`
@@ -149,7 +149,7 @@ async def iterate_single_component(
             end_dt=end_dt,
             page_size=page_size,
         ):
-            for entry in page.iterate_metric_samples():
+            for entry in page:
                 yield entry
 
     # pylint: disable=too-many-arguments