diff --git a/addons/docs/src/frameworks/react/jsxDecorator.test.tsx b/addons/docs/src/frameworks/react/jsxDecorator.test.tsx
index 6230dddec2ad..63d98262f916 100644
--- a/addons/docs/src/frameworks/react/jsxDecorator.test.tsx
+++ b/addons/docs/src/frameworks/react/jsxDecorator.test.tsx
@@ -252,4 +252,24 @@ describe('jsxDecorator', () => {
     jsxDecorator(storyFn, context);
     expect(transformSource).toHaveBeenCalledWith('<div>\n  args story\n</div>', context);
   });
+
+  it('renders MDX properly', () => {
+    // FIXME: generate this from actual MDX
+    const mdxElement = {
+      type: { displayName: 'MDXCreateElement' },
+      props: {
+        mdxType: 'div',
+        originalType: 'div',
+        className: 'foo',
+      },
+    };
+
+    jsxDecorator(() => mdxElement, makeContext('mdx-args', { __isArgsStory: true }, {}));
+
+    expect(mockChannel.emit).toHaveBeenCalledWith(
+      SNIPPET_RENDERED,
+      'jsx-test--mdx-args',
+      '<div className="foo" />'
+    );
+  });
 });
diff --git a/addons/docs/src/frameworks/react/jsxDecorator.tsx b/addons/docs/src/frameworks/react/jsxDecorator.tsx
index ec79c9528526..57dee05a5189 100644
--- a/addons/docs/src/frameworks/react/jsxDecorator.tsx
+++ b/addons/docs/src/frameworks/react/jsxDecorator.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { createElement, ReactElement } from 'react';
 import reactElementToJSXString, { Options } from 'react-element-to-jsx-string';
 import dedent from 'ts-dedent';
 import deprecate from 'util-deprecate';
@@ -150,6 +150,19 @@ export const skipJsxRender = (context: StoryContext) => {
   return !isArgsStory || sourceParams?.code || sourceParams?.type === SourceType.CODE;
 };
 
+const isMdx = (node: any) => node.type?.displayName === 'MDXCreateElement' && !!node.props?.mdxType;
+
+const mdxToJsx = (node: any) => {
+  if (!isMdx(node)) return node;
+  const { mdxType, originalType, children, ...rest } = node.props;
+  let jsxChildren = [] as ReactElement[];
+  if (children) {
+    const array = Array.isArray(children) ? children : [children];
+    jsxChildren = array.map(mdxToJsx);
+  }
+  return createElement(originalType, rest, ...jsxChildren);
+};
+
 export const jsxDecorator = (storyFn: any, context: StoryContext) => {
   const story = storyFn();
 
@@ -167,10 +180,12 @@ export const jsxDecorator = (storyFn: any, context: StoryContext) => {
   } as Required<JSXOptions>;
 
   // Exclude decorators from source code snippet by default
-  const sourceJsx = context?.parameters.docs?.source?.excludeDecorators
+  const storyJsx = context?.parameters.docs?.source?.excludeDecorators
     ? context.originalStoryFn(context.args)
     : story;
 
+  const sourceJsx = mdxToJsx(storyJsx);
+
   let jsx = '';
   const rendered = renderJsx(sourceJsx, options);
   if (rendered) {