diff --git a/gatsby-config.js b/gatsby-config.js
index f52a4b0a60824..c6fab89b8e090 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -13,7 +13,10 @@ module.exports = {
   },
   flags: {
     FAST_DEV: true,
-    PARALLEL_SOURCING: true
+    PARALLEL_SOURCING: true,
+    // PRESERVE_FILE_DOWNLOAD_CACHE: true,
+    DETECT_NODE_MUTATIONS: true,
+    PARTIAL_HYDRATION: true
   },
   trailingSlash: "never",
   plugins: [
diff --git a/src/templates/blog-single.js b/src/templates/blog-single.js
index 65d7cd2188434..54a07357027c2 100644
--- a/src/templates/blog-single.js
+++ b/src/templates/blog-single.js
@@ -44,6 +44,9 @@ export const query = graphql`query BlogsBySlug($slug: String!) {
 
 const BlogSinglePage = ({ data }) => {
 
+  if (!data?.mdx) {
+    return null;
+  }
 
   return (
 
@@ -63,5 +66,5 @@ export default BlogSinglePage;
 
 
 export const Head = ({ data }) => {
-  return <SEO title={data.mdx.frontmatter.title} image={data.mdx.frontmatter.thumbnail.publicURL} description={data.mdx.frontmatter.description} />;
+  return <SEO title={data?.mdx?.frontmatter?.title} image={data?.mdx?.frontmatter?.thumbnail?.publicURL} description={data.mdx.frontmatter.description} />;
 };
\ No newline at end of file