diff --git a/packages/styleguide/src/components/MDX/MDX.js b/packages/styleguide/src/components/MDX/MDX.js
index c49fc4463ef..cb830beb8a3 100644
--- a/packages/styleguide/src/components/MDX/MDX.js
+++ b/packages/styleguide/src/components/MDX/MDX.js
@@ -37,7 +37,7 @@ export const MDXComponents = {
   inlineCode: props => <Code {...props} />,
   code: props => (
     <CodeBlock
-      language={props.className && props.className.replace(/language-/, '')}
+      language={props.className?.replace(/language-/, '')}
       {...props}
     />
   ),