diff --git a/client/pyroclient/client.py b/client/pyroclient/client.py
index af4fa53b..c32bec3b 100644
--- a/client/pyroclient/client.py
+++ b/client/pyroclient/client.py
@@ -127,18 +127,23 @@ def fetch_cameras(self) -> Response:
             timeout=self.timeout,
         )
 
-    def heartbeat(self) -> Response:
+    def heartbeat(self, timeout: int | None = None) -> Response:
         """Update the last ping of the camera
 
         >>> from pyroclient import Client
         >>> api_client = Client("MY_CAM_TOKEN")
         >>> response = api_client.heartbeat()
 
+        Args:
+            timeout: request timeout in seconds for this call only; defaults to the client timeout
+
         Returns:
             HTTP response containing the update device info
         """
         return requests.patch(
-            urljoin(self._route_prefix, ClientRoute.CAMERAS_HEARTBEAT), headers=self.headers, timeout=self.timeout
+            urljoin(self._route_prefix, ClientRoute.CAMERAS_HEARTBEAT),
+            headers=self.headers,
+            timeout=self.timeout if timeout is None else timeout,
         )
 
     def update_last_image(self, media: bytes) -> Response:
diff --git a/client/tests/test_client.py b/client/tests/test_client.py
index 35425987..b046162e 100644
--- a/client/tests/test_client.py
+++ b/client/tests/test_client.py
@@ -208,3 +208,25 @@ def test_user_workflow(test_cam_workflow, user_token):
     assert len(response.json()) == 3  # ceil(5 / 2)
     assert response.headers["x-sampled-total"] == "3"
     assert response.headers["x-sampled-truncated"] == "false"
+
+
+def test_heartbeat_timeout_override(monkeypatch):
+    """heartbeat() uses the client timeout unless an explicit per-call timeout is given."""
+
+    class _Resp:
+        status_code = 200
+        text = "ok"
+
+    captured: list = []
+
+    def fake_patch(url, headers=None, timeout=None):
+        captured.append(timeout)
+        return _Resp()
+
+    monkeypatch.setattr(requests, "get", lambda *_args, **_kwargs: _Resp())
+    monkeypatch.setattr(requests, "patch", fake_patch)
+
+    api_client = Client("tok", "http://testserver", timeout=10)
+    api_client.heartbeat()
+    api_client.heartbeat(timeout=3)
+    assert captured == [10, 3]