diff --git a/playwright/_impl/_helper.py b/playwright/_impl/_helper.py
index 065ce101b..88a10589d 100644
--- a/playwright/_impl/_helper.py
+++ b/playwright/_impl/_helper.py
@@ -177,8 +177,8 @@ class HarLookupResult(TypedDict, total=False):
 class TimeoutSettings:
     def __init__(self, parent: Optional["TimeoutSettings"]) -> None:
         self._parent = parent
-        self._timeout = 30000.0
-        self._navigation_timeout = 30000.0
+        self._timeout: Optional[float] = None
+        self._navigation_timeout: Optional[float] = None
 
     def set_timeout(self, timeout: float) -> None:
         self._timeout = timeout
diff --git a/tests/async/test_page.py b/tests/async/test_page.py
index 54abccb9d..8673abfda 100644
--- a/tests/async/test_page.py
+++ b/tests/async/test_page.py
@@ -18,7 +18,7 @@
 
 import pytest
 
-from playwright.async_api import Error, Page, Route, TimeoutError
+from playwright.async_api import BrowserContext, Error, Page, Route, TimeoutError
 from tests.server import Server
 
 
@@ -331,6 +331,19 @@ async def test_wait_for_response_should_work_with_no_timeout(page, server):
     assert response.url == server.PREFIX + "/digits/2.png"
 
 
+async def test_wait_for_response_should_use_context_timeout(
+    page: Page, context: BrowserContext, server: Server
+) -> None:
+    await page.goto(server.EMPTY_PAGE)
+
+    context.set_default_timeout(1_000)
+    with pytest.raises(Error) as exc_info:
+        async with page.expect_response("https://playwright.dev"):
+            pass
+    assert exc_info.type is TimeoutError
+    assert "Timeout 1000ms exceeded" in exc_info.value.message
+
+
 async def test_expose_binding(page):
     binding_source = []
 
diff --git a/tests/sync/test_sync.py b/tests/sync/test_sync.py
index 6ab859038..375e4ff2a 100644
--- a/tests/sync/test_sync.py
+++ b/tests/sync/test_sync.py
@@ -277,3 +277,16 @@ def test_expect_response_should_work(page: Page, server: Server) -> None:
     assert resp.value.status == 200
     assert resp.value.ok
     assert resp.value.request
+
+
+def test_expect_response_should_use_context_timeout(
+    page: Page, context: BrowserContext, server: Server
+) -> None:
+    page.goto(server.EMPTY_PAGE)
+
+    context.set_default_timeout(1_000)
+    with pytest.raises(Error) as exc_info:
+        with page.expect_response("https://playwright.dev"):
+            pass
+    assert exc_info.type is TimeoutError
+    assert "Timeout 1000ms exceeded" in exc_info.value.message