diff --git a/core/gatsby-theme-docz/src/base/Layout.js b/core/gatsby-theme-docz/src/base/Layout.js
index 7c0f5a0d7..2be201148 100644
--- a/core/gatsby-theme-docz/src/base/Layout.js
+++ b/core/gatsby-theme-docz/src/base/Layout.js
@@ -16,11 +16,9 @@ const Route = ({ children, entry, ...defaultProps }) => {
   const props = { ...defaultProps, doc: entry }
   if (!entry) return <NotFound />
   return (
-    <MDXProvider components={components}>
-      <Wrapper doc={entry}>
-        <Layout {...props}>{children}</Layout>
-      </Wrapper>
-    </MDXProvider>
+    <Wrapper doc={entry}>
+      <Layout {...props}>{children}</Layout>
+    </Wrapper>
   )
 }
 
diff --git a/core/gatsby-theme-docz/src/index.js b/core/gatsby-theme-docz/src/index.js
index fe69ce6b0..7eca87699 100644
--- a/core/gatsby-theme-docz/src/index.js
+++ b/core/gatsby-theme-docz/src/index.js
@@ -9,7 +9,7 @@ import components from '~components'
 const Theme = ({ children }) => {
   const config = useConfig()
   return (
-    <ThemeProvider theme={config.themeConfig}>
+    <ThemeProvider theme={config.themeConfig} components={components}>
       <ComponentsProvider components={components}>
         <Styled.root>{children}</Styled.root>
       </ComponentsProvider>