diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index ab7a7e4fba..745d718c8f 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -48,9 +48,11 @@ module.exports = class Builder {
     // Stop watching on nuxt.close()
     if (this.options.dev) {
       this.nuxt.hook('close', () => this.unwatch())
-    } else {
-      this.nuxt.hook('build:done', () => this.generateConfig())
     }
+    // else {
+    // TODO: enable again when unsafe concern resolved.(common/options.js:42)
+    // this.nuxt.hook('build:done', () => this.generateConfig())
+    // }
   }
 
   get plugins() {
diff --git a/lib/common/options.js b/lib/common/options.js
index b3c8b19fb6..819d7a0e7e 100755
--- a/lib/common/options.js
+++ b/lib/common/options.js
@@ -137,10 +137,10 @@ Options.modes = {
   }
 }
 
-Options.unsafeKeys = [
-  'rootDir', 'srcDir', 'buildDir', 'modulesDir', 'cacheDir', 'nuxtDir',
-  'nuxtAppDir', 'build', 'generate', 'router.routes', 'appTemplatePath'
-]
+// Options.unsafeKeys = [
+//   'rootDir', 'srcDir', 'buildDir', 'modulesDir', 'cacheDir', 'nuxtDir',
+//   'nuxtAppDir', 'build', 'generate', 'router.routes', 'appTemplatePath'
+// ]
 
 Options.defaults = {
   mode: 'universal',