diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index f742a0c10..cc0493a60 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -112,7 +112,7 @@ class ConfigSchemaHandler {
     const denormalizeOptions = normalizeUserConfig(userConfig);
     validate(userConfig);
     denormalizeUserConfig(userConfig, denormalizeOptions);
-    if (validate.errors) {
+    if (validate.errors && this.serverless.service.configValidationMode !== 'off') {
       const messages = normalizeAjvErrors(validate.errors).map(err => err.message);
       this.handleErrorMessages(messages);
     }
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index ef9b3c297..da412f5fe 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -224,9 +224,7 @@ class Service {
     if (userConfig.functions) userConfig.functions = this.functions;
     if (userConfig.resources) userConfig.resources = this.resources;
 
-    if (this.configValidationMode !== 'off') {
-      this.serverless.configSchemaHandler.validateConfig(userConfig);
-    }
+    this.serverless.configSchemaHandler.validateConfig(userConfig);
 
     return this;
   }