diff --git a/tests/e2e/proxy_client.py b/tests/e2e/proxy_client.py
index 36dada5770a..b3fc8538322 100644
--- a/tests/e2e/proxy_client.py
+++ b/tests/e2e/proxy_client.py
@@ -154,6 +154,8 @@ def await_servable(
         if not listed:
             first_seen_at = None
         elif first_seen_at is None:
+            if t > started + timeout:
+                return NotServable(last_result=last_result)
             first_seen_at = t
             if db_sync_seconds <= 0:
                 return Servable()