diff --git a/client/gatsby-browser.js b/client/gatsby-browser.js
index 9c69ef5b9f..b7108a6f97 100644
--- a/client/gatsby-browser.js
+++ b/client/gatsby-browser.js
@@ -31,11 +31,7 @@ export const wrapPageElement = ({ element, props }) => {
     location: { pathname }
   } = props;
   if (pathname === '/') {
-    return (
-      <DefaultLayout disableSettings={true} landingPage={true}>
-        {element}
-      </DefaultLayout>
-    );
+    return <DefaultLayout landingPage={true}>{element}</DefaultLayout>;
   }
   if (/^\/certification(\/.*)*/.test(pathname)) {
     return <CertificationLayout>{element}</CertificationLayout>;
diff --git a/client/src/components/layouts/Default.js b/client/src/components/layouts/Default.js
index 86894edcce..a4ecd920b2 100644
--- a/client/src/components/layouts/Default.js
+++ b/client/src/components/layouts/Default.js
@@ -68,7 +68,7 @@ const propTypes = {
   isOnline: PropTypes.bool.isRequired,
   isSignedIn: PropTypes.bool,
   landingPage: PropTypes.bool,
-  navigationMenu: PropTypes.element.isRequired,
+  navigationMenu: PropTypes.element,
   onlineStatusChange: PropTypes.func.isRequired,
   removeFlashMessage: PropTypes.func.isRequired,
   showFooter: PropTypes.bool