diff --git a/gallery/src/pages/lovelace/markdown-card.ts b/gallery/src/pages/lovelace/markdown-card.ts
index 576e6189c7..aa47310b52 100644
--- a/gallery/src/pages/lovelace/markdown-card.ts
+++ b/gallery/src/pages/lovelace/markdown-card.ts
@@ -80,6 +80,9 @@ const CONFIGS = [
     > [!CAUTION]
     > This is a GitHub caution alert
 
+    > [!TIP]
+    > - This is a list entry in GitHub tip alert
+
     ## Lists
 
     Unordered
diff --git a/src/components/ha-markdown-element.ts b/src/components/ha-markdown-element.ts
index e282378ada..cd4e90c0c9 100644
--- a/src/components/ha-markdown-element.ts
+++ b/src/components/ha-markdown-element.ts
@@ -98,13 +98,16 @@ class HaMarkdownElement extends ReactiveElement {
                 firstElementChild!.childNodes[1].textContent?.trimStart()) ||
               "";
 
-          const childNodes = Array.from(firstElementChild!.childNodes);
-          for (const child of childNodes.slice(
-            childNodes.findIndex(
-              // There is always a line break between the title and the content, we want to skip that
-              (childNode) => childNode instanceof HTMLBRElement
-            ) + 1
-          )) {
+          const childNodes = Array.from(node.childNodes)
+            .map((child) => Array.from(child.childNodes))
+            .reduce((acc, val) => acc.concat(val), [])
+            .filter(
+              (childNode) =>
+                childNode.textContent &&
+                !(childNode.textContent in _gitHubBlockQuoteToAlert) &&
+                !(childNode.textContent in _legacyGitHubBlockQuoteToAlert)
+            );
+          for (const child of childNodes) {
             alertNote.appendChild(child);
           }
           node.firstElementChild!.replaceWith(alertNote);