diff --git a/lib/load/docs/metadata.js b/lib/load/docs/metadata.js
index 0a2e086af4..550303f427 100644
--- a/lib/load/docs/metadata.js
+++ b/lib/load/docs/metadata.js
@@ -64,7 +64,10 @@ module.exports = async function processMetadata(source, refDir, env, order) {
 
   /* version */
   let versionRefDir = refDir;
-  if (language && language !== idx(env, ['translation', 'defaultLanguage', 'tag'])) {
+  if (
+    language &&
+    language !== idx(env, ['translation', 'defaultLanguage', 'tag'])
+  ) {
     versionRefDir = path.join(refDir, language);
   }
   const version = getVersion(filepath, versionRefDir, env);
diff --git a/lib/webpack/server.js b/lib/webpack/server.js
index d55481ffd0..ce2af23d87 100644
--- a/lib/webpack/server.js
+++ b/lib/webpack/server.js
@@ -17,7 +17,10 @@ module.exports = function createServerConfig(props) {
   const {siteConfig, docsData, pagesData} = props;
 
   // static site generator webpack plugin
-  const paths = [...docsData, ...pagesData].map(data => data.path);
+  const docsLinks = Object.values(docsData).map(data => ({
+    path: `${siteConfig.baseUrl}${data.permalink}`
+  }));
+  const paths = [...docsLinks, ...pagesData].map(data => data.path);
   config.plugin('siteGenerator').use(staticSiteGenerator, [
     {
       entry: 'main',