diff --git a/server/routers/dashboard.py b/server/routers/dashboard.py
index 7a43f53..61ab0fa 100644
--- a/server/routers/dashboard.py
+++ b/server/routers/dashboard.py
@@ -91,7 +91,7 @@ async def ws_endpoint(ws: WebSocket) -> None:
         while True:
             # Wait for a client ping / keepalive; refresh on timeout too.
             try:
-                _msg = await asyncio.wait_for(ws.receive_text(), timeout=20.0)
+                _msg = await asyncio.wait_for(ws.receive_text(), timeout=12.0)
             except asyncio.TimeoutError:
                 pass
 
diff --git a/web/src/hooks/useWebSocket.ts b/web/src/hooks/useWebSocket.ts
index e3bccf8..59e8c2d 100644
--- a/web/src/hooks/useWebSocket.ts
+++ b/web/src/hooks/useWebSocket.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import type { DashboardData } from "../api";
 
 const WS_RECONNECT_MS = 5_000;
-const WS_PING_INTERVAL_MS = 15_000;
+const WS_PING_INTERVAL_MS = 10_000;
 
 export function useWebSocket() {
   const [data, setData] = useState<DashboardData | null>(null);