diff --git a/docs/snippets/common/component-story-mdx-argstable-block.mdx.mdx b/docs/snippets/common/component-story-mdx-argstable-block-for-component.mdx.mdx
similarity index 100%
rename from docs/snippets/common/component-story-mdx-argstable-block.mdx.mdx
rename to docs/snippets/common/component-story-mdx-argstable-block-for-component.mdx.mdx
diff --git a/docs/snippets/common/component-story-mdx-argstable-block-for-story.mdx.mdx b/docs/snippets/common/component-story-mdx-argstable-block-for-story.mdx.mdx
new file mode 100644
index 000000000000..8808665b07a1
--- /dev/null
+++ b/docs/snippets/common/component-story-mdx-argstable-block-for-story.mdx.mdx
@@ -0,0 +1,15 @@
+```md
+<!--- MyComponent.stories.mdx -->
+
+import { ArgsTable } from '@storybook/addon-docs';
+import { MyComponent } from './MyComponent';
+
+# My Component!
+
+<Story name="My Story">
+  <!-- my story for MyComponent -->
+  {(args) => <MyComponent {...args} />}
+</Story>
+
+<ArgsTable story="My Story" />
+```
diff --git a/docs/writing-docs/doc-blocks.md b/docs/writing-docs/doc-blocks.md
index 3068247bea1e..5b2be86d6421 100644
--- a/docs/writing-docs/doc-blocks.md
+++ b/docs/writing-docs/doc-blocks.md
@@ -60,11 +60,25 @@ To use the `ArgsTable` in [DocsPage](./docs-page.md#component-parameter), export
 
 To use the `ArgsTable` block in MDX, add the following:
 
+#### For components
+
+<!-- prettier-ignore-start -->
+
+<CodeSnippets
+  paths={[
+    'common/component-story-mdx-argstable-block-for-component.mdx.mdx',
+  ]}
+/>
+
+<!-- prettier-ignore-end -->
+
+#### For Stories
+
 <!-- prettier-ignore-start -->
 
 <CodeSnippets
   paths={[
-    'common/component-story-mdx-argstable-block.mdx.mdx',
+    'common/component-story-mdx-argstable-block-for-story.mdx.mdx',
   ]}
 />