diff --git a/src/components/Guide/GuideContent.tsx b/src/components/Guide/GuideContent.tsx
index c848cd7b4..9d81e6008 100644
--- a/src/components/Guide/GuideContent.tsx
+++ b/src/components/Guide/GuideContent.tsx
@@ -34,7 +34,7 @@ export function GuideContent(props: GuideContentProps) {
           showTableOfContent && 'lg:border-r',
         )}
       >
-        <div className="prose prose-xl prose-h2:mb-3 prose-h2:mt-10 prose-h2:scroll-mt-5 prose-h2:text-balance prose-h2:text-3xl prose-h3:mt-2 prose-h4:text-2xl prose-h3:scroll-mt-5 prose-h3:text-balance prose-h4:text-balance prose-h5:text-balance prose-h5:font-medium prose-blockquote:font-normal prose-code:bg-transparent prose-img:mt-1 sm:prose-h2:scroll-mt-10 sm:prose-h3:scroll-mt-10 container">
+        <div className="prose prose-xl prose-h2:mb-3 prose-h2:mt-10 prose-h2:scroll-mt-5 prose-h2:text-balance prose-h2:text-3xl prose-h3:mt-2 prose-h4:text-2xl prose-h3:scroll-mt-5 prose-h3:text-balance prose-h4:text-balance prose-h5:text-balance prose-h5:font-medium prose-blockquote:font-normal prose-code:bg-transparent prose-img:mt-1 sm:prose-h2:scroll-mt-10 sm:prose-h3:scroll-mt-10 prose-li:[&>p]:m-0 container">
           <h1 className="mb-3 text-4xl font-bold text-balance">
             {guide.title}
           </h1>
diff --git a/src/lib/guide-renderer.tsx b/src/lib/guide-renderer.tsx
index 02c63b756..ac60f8768 100644
--- a/src/lib/guide-renderer.tsx
+++ b/src/lib/guide-renderer.tsx
@@ -129,8 +129,10 @@ export class GuideRenderer {
     const nodes = node.content || [];
     const headlines: Array<HeadingType> = [];
 
+    let hasFoundQASection = false;
     const extractHeadlines = (node: JSONContent) => {
-      if (node.type === 'qaSection') {
+      if (node.type === 'qaSection' || hasFoundQASection) {
+        hasFoundQASection = true;
         return;
       }
 
@@ -231,7 +233,6 @@ export class GuideRenderer {
       node.content?.every(
         (child) => child.type === 'text' && child.text === '',
       );
-
     if (isEmpty) {
       return <></>;
     }
@@ -368,7 +369,7 @@ export class GuideRenderer {
     return <blockquote>{this.content(node)}</blockquote>;
   }
 
-  private questions(node: JSONContent) {
+  questions(node: JSONContent) {
     const content = node.content || [];
     const questions: QuestionType[] = [];
     let currentTopic: string | null = null;