diff --git a/packages/cubejs-server-core/src/core/optionsValidate.ts b/packages/cubejs-server-core/src/core/optionsValidate.ts
index a5678a9b6aef4..e0f89aec102ae 100644
--- a/packages/cubejs-server-core/src/core/optionsValidate.ts
+++ b/packages/cubejs-server-core/src/core/optionsValidate.ts
@@ -3,7 +3,7 @@ import DriverDependencies from './DriverDependencies';
 
 const schemaQueueOptions = Joi.object().strict(true).keys({
   concurrency: Joi.number().min(1).integer(),
-  continueWaitTimeout: Joi.number().min(0).integer(),
+  continueWaitTimeout: Joi.number().min(0).max(90 * 1000).integer(),
   executionTimeout: Joi.number().min(0).integer(),
   orphanedTimeout: Joi.number().min(0).integer(),
   heartBeatInterval: Joi.number().min(0).integer(),
@@ -128,7 +128,7 @@ const schemaOptions = Joi.object().keys({
           idleTimeoutMillis: Joi.number().min(0),
         })
       }),
-      continueWaitTimeout: Joi.number().min(0).integer(),
+      continueWaitTimeout: Joi.number().min(0).max(90 * 1000).integer(),
       skipExternalCacheAndQueue: Joi.boolean(),
       queryCacheOptions: Joi.object().keys({
         refreshKeyRenewalThreshold: Joi.number().min(0).integer(),