diff --git a/www/src/templates/template-blog-post.js b/www/src/templates/template-blog-post.js
index a24737cf78bd5..cbec0e4ba8070 100644
--- a/www/src/templates/template-blog-post.js
+++ b/www/src/templates/template-blog-post.js
@@ -226,20 +226,7 @@ class BlogPostTemplate extends React.Component {
           }}
         >
           <Container>
-            <PrevAndNext
-              prev={
-                prev && {
-                  title: prev.frontmatter.title,
-                  link: prev.fields.slug,
-                }
-              }
-              next={
-                next && {
-                  title: next.frontmatter.title,
-                  link: next.fields.slug,
-                }
-              }
-            />
+            <PrevAndNext prev={prev} next={next} />
           </Container>
           <FooterLinks />
         </div>
diff --git a/www/src/utils/node/docs.js b/www/src/utils/node/docs.js
index e81ade29f5706..4d0bba4a55b41 100644
--- a/www/src/utils/node/docs.js
+++ b/www/src/utils/node/docs.js
@@ -55,6 +55,7 @@ exports.createPages = async ({ graphql, actions }) => {
             released
           }
           frontmatter {
+            title
             draft
             canonicalLink
             publishedAt
@@ -122,8 +123,14 @@ exports.createPages = async ({ graphql, actions }) => {
       component: slash(blogPostTemplate),
       context: {
         slug: node.fields.slug,
-        prev,
-        next,
+        prev: prev && {
+          title: prev.frontmatter.title,
+          link: prev.fields.slug,
+        },
+        next: next && {
+          title: next.frontmatter.title,
+          link: next.fields.slug,
+        },
       },
     })
   })