diff --git a/apps/api/src/controllers/v1/types.ts b/apps/api/src/controllers/v1/types.ts
index 7693ae04..465810ba 100644
--- a/apps/api/src/controllers/v1/types.ts
+++ b/apps/api/src/controllers/v1/types.ts
@@ -140,7 +140,7 @@ export const scrapeOptions = z
     excludeTags: z.string().array().optional(),
     onlyMainContent: z.boolean().default(true),
     timeout: z.number().int().positive().finite().safe().optional(),
-    waitFor: z.number().int().nonnegative().finite().safe().max(60000).default(0),
+    waitFor: z.number().int().nonnegative().finite().safe().max(30000).default(0),
     // Deprecate this to jsonOptions
     extract: extractOptions.optional(),
     // New
diff --git a/apps/api/src/scraper/scrapeURL/engines/fire-engine/index.ts b/apps/api/src/scraper/scrapeURL/engines/fire-engine/index.ts
index 50198ca7..eda8402d 100644
--- a/apps/api/src/scraper/scrapeURL/engines/fire-engine/index.ts
+++ b/apps/api/src/scraper/scrapeURL/engines/fire-engine/index.ts
@@ -151,9 +151,9 @@ export async function scrapeURLWithFireEngineChromeCDP(
     // Transform waitFor option into an action (unsupported by chrome-cdp)
     ...(meta.options.waitFor !== 0
       ? [
-          {
+          { 
             type: "wait" as const,
-            milliseconds: meta.options.waitFor,
+            milliseconds: meta.options.waitFor > 30000 ? 30000 : meta.options.waitFor,
           },
         ]
       : []),