diff --git a/adev/shared-docs/pipeline/guides/extensions/docs-workflow/docs-step.ts b/adev/shared-docs/pipeline/guides/extensions/docs-workflow/docs-step.ts
index 766c2c382d5..781fe7550df 100644
--- a/adev/shared-docs/pipeline/guides/extensions/docs-workflow/docs-step.ts
+++ b/adev/shared-docs/pipeline/guides/extensions/docs-workflow/docs-step.ts
@@ -7,7 +7,7 @@
  */
 
 import {Token, Tokens, RendererThis, TokenizerThis} from 'marked';
-import {headingRender} from '../../tranformations/heading';
+import {formatHeading, headingRender} from '../../tranformations/heading';
 
 interface DocsStepToken extends Tokens.Generic {
   type: 'docs-step';
@@ -51,7 +51,7 @@ export const docsStepExtension = {
     return `
     <li>
       <span class="docs-step-number" aria-hidden="true"></span>
-      ${headingRender({text: token.title, depth: 3, type: 'heading', raw: token.title, tokens: []})}
+      ${formatHeading({text: token.title, depth: 3})}
       ${this.parser.parse(token.tokens)}
     </li>
     `;
diff --git a/adev/shared-docs/pipeline/guides/testing/heading/heading.md b/adev/shared-docs/pipeline/guides/testing/heading/heading.md
index 1307a212f15..31203e15b42 100644
--- a/adev/shared-docs/pipeline/guides/testing/heading/heading.md
+++ b/adev/shared-docs/pipeline/guides/testing/heading/heading.md
@@ -9,4 +9,5 @@
 ## Duplicate Anchor
 ## `myClass.myMethod` is the best
 ## ステップ 2 - アプリケーションのレイアウトに新しいコンポーネントを追加
-## My heading {# my-custom-id }
\ No newline at end of file
+## My heading {# my-custom-id }
+## Query for the `<h1>`
\ No newline at end of file
diff --git a/adev/shared-docs/pipeline/guides/testing/heading/heading.spec.ts b/adev/shared-docs/pipeline/guides/testing/heading/heading.spec.ts
index 2c1500962a7..703e316e1bd 100644
--- a/adev/shared-docs/pipeline/guides/testing/heading/heading.spec.ts
+++ b/adev/shared-docs/pipeline/guides/testing/heading/heading.spec.ts
@@ -83,4 +83,15 @@ describe('markdown to html', () => {
     expect(h2HeaderId).toBe('my-custom-id');
     expect(h2AnchorHref).toBe(`#${h2HeaderId}`);
   });
+
+  it('should be able to parse heading with a valid tag in a code block', () => {
+    const h2List = markdownDocument.querySelectorAll('h2');
+    const h2 = h2List[6];
+
+    // The anchor element should be to only child
+    expect(h2.children.length).toBe(1);
+    expect(h2.firstElementChild?.tagName).toBe('A');
+
+    expect(h2.firstElementChild!.innerHTML).toBe('Query for the <code>&lt;h1&gt;</code>');
+  });
 });
diff --git a/adev/shared-docs/pipeline/guides/tranformations/heading.ts b/adev/shared-docs/pipeline/guides/tranformations/heading.ts
index 8907c0b7595..1c86fd37da3 100644
--- a/adev/shared-docs/pipeline/guides/tranformations/heading.ts
+++ b/adev/shared-docs/pipeline/guides/tranformations/heading.ts
@@ -11,8 +11,12 @@ import {Renderer, Tokens} from 'marked';
 import {getHeaderId} from '../state';
 import {getPageTitle} from '../utils';
 
-export function headingRender({text, depth}: Tokens.Heading): string;
-export function headingRender(this: Renderer, {text, depth}: Tokens.Heading): string {
+export function headingRender(this: Renderer, {depth, tokens}: Tokens.Heading): string {
+  const text = this?.parser.parseInline(tokens);
+  return formatHeading({text, depth});
+}
+
+export function formatHeading({text, depth}: {text: string; depth: number}): string {
   if (depth === 1) {
     return `
     <header class="docs-header">