diff --git a/packages/docusaurus-theme-classic/src/theme/Admonition/Layout/index.tsx b/packages/docusaurus-theme-classic/src/theme/Admonition/Layout/index.tsx
index 7bdda31bc3..eafe0400c6 100644
--- a/packages/docusaurus-theme-classic/src/theme/Admonition/Layout/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Admonition/Layout/index.tsx
@@ -50,7 +50,7 @@ export default function AdmonitionLayout(props: Props): JSX.Element {
   const {type, icon, title, children, className} = props;
   return (
     <AdmonitionContainer type={type} className={className}>
-      <AdmonitionHeading title={title} icon={icon} />
+      {title || icon ? <AdmonitionHeading title={title} icon={icon} /> : null}
       <AdmonitionContent>{children}</AdmonitionContent>
     </AdmonitionContainer>
   );
diff --git a/website/_dogfooding/_pages tests/markdown-tests-mdx.mdx b/website/_dogfooding/_pages tests/markdown-tests-mdx.mdx
index feaf146f05..b54eef02ac 100644
--- a/website/_dogfooding/_pages tests/markdown-tests-mdx.mdx	
+++ b/website/_dogfooding/_pages tests/markdown-tests-mdx.mdx	
@@ -333,6 +333,20 @@ test
 
 ::::
 
+```mdx-code-block
+import Admonition from '@theme/Admonition';
+
+export function AdmonitionWithoutHeading(props) {
+  return (
+    <Admonition {...props} type="info" icon={null} title={null}>
+      Admonition content without heading
+    </Admonition>
+  );
+}
+```
+
+<AdmonitionWithoutHeading />
+
 ## Linking
 
 This is a test page to see if Docusaurus Markdown features are working properly