diff --git a/camera-server/src/janus/janus-api.ts b/camera-server/src/janus/janus-api.ts
index 7ab08b0420bae03c1f19ce4603b1697731918270..fb0df2a093e461402adb3ce542fd296c8f1b5644 100644
--- a/camera-server/src/janus/janus-api.ts
+++ b/camera-server/src/janus/janus-api.ts
@@ -17,7 +17,8 @@ interface RoomConfig {
 }
 
 export const api = axios.create({
-    baseURL: config.janusURL
+    baseURL: config.janusURL,
+    timeout: 2500
 });
 
 export const postRequest = <T extends { janus: JanusVerb }>(
@@ -34,7 +35,9 @@ export const sessionLongPoll = (
     maxExents = 10
 ) => {
     return api.get(`/${sessionId}?rid=${Date.now()}&maxev=${maxExents}`, {
-        cancelToken
+        cancelToken,
+        // Answer should come in 30000ms
+        timeout: 35000
     });
 };