diff --git a/scripts/check_build_config.js b/scripts/check_build_config.js
index ccced1cb..4f18b543 100644
--- a/scripts/check_build_config.js
+++ b/scripts/check_build_config.js
@@ -4,7 +4,7 @@ function validateBuildConfig(config) {
   if (config.enableServerManagement === false && config.defaultTeams && config.defaultTeams.length === 0) {
     return {
       result: false,
-      message: `When "enableServerManagement: false" is specified in buildConfig.js, "defaultTeams" must have one team at least.\n${JSON.stringify(config, null, 2)}`
+      message: `Specify at least one server for "defaultTeams" in buildConfig.js when "enableServerManagement is set to false.\n${JSON.stringify(config, null, 2)}`
     };
   }
   return {result: true};
diff --git a/src/common/config/buildConfig.js b/src/common/config/buildConfig.js
index 141c82f4..62ca0d54 100644
--- a/src/common/config/buildConfig.js
+++ b/src/common/config/buildConfig.js
@@ -6,6 +6,8 @@
  * @prop {string} helpLink - The URL for "Help->Learn More..." menu item.
  *                           If null is specified, the menu disappears.
  * @prop {boolean} enableServerManagement - Whether users can edit servers configuration.
+ *                                          Specify at least one server for "defaultTeams"
+ *                                          when "enableServerManagement is set to false
  */
 const buildConfig = {
   defaultTeams: [/*