diff --git a/docgen/server/generate.js b/docgen/server/generate.js
index d6494386751..c99c53babea 100644
--- a/docgen/server/generate.js
+++ b/docgen/server/generate.js
@@ -346,12 +346,6 @@ function checkoutMasterDocs() {
       // and make versioned sidebar?
       return seq; //copy
     })
-    .then(() => {
-
-    })
-    .then(() => {
-      return generateAutodocs();
-    })
     .then(() => {
       console.log(`My sidebar: ${JSON.stringify(sidebarMetadata)}`);
 
@@ -488,21 +482,31 @@ function generateMetatadaFile(categories) {
 // END DOM
 
 
+function checkoutAutodocs() {
+  return Promise.resolve()
+  .then(() => {
+    return generateAutodocs();
+  })
+  .finally(function() {
+    server.close();
+  }).catch(function(e) {
+    console.error(e);
+    process.exit(1);
+  });
+}
+
 if (argv.clean) {
   cleanFiles();
 }
 
-if (argv.autodocs) {
-  runChecks();
-  // checkOutDocs();
-  checkoutMasterDocs()
-    .finally(function() {
-      server.close();
-    }).catch(function(e) {
-      console.error(e);
-      process.exit(1);
-    });
-}
+// if (argv.autodocs) {
+runChecks();
+// checkOutDocs();
+checkoutMasterDocs()
+  .then(() => {
+    checkoutAutodocs();
+  })  
+// }
 
 /**
  * Check out gh-pages branch, cd releases/