diff --git a/src/lib/output/themes/default/partials/hierarchy.tsx b/src/lib/output/themes/default/partials/hierarchy.tsx
index 3d35c73e0..47a3b11c7 100644
--- a/src/lib/output/themes/default/partials/hierarchy.tsx
+++ b/src/lib/output/themes/default/partials/hierarchy.tsx
@@ -2,13 +2,20 @@ import type { DefaultThemeRenderContext } from "../DefaultThemeRenderContext";
 import { JSX } from "../../../../utils";
 import type { DeclarationHierarchy } from "../../../../models";
 
-export const hierarchy = (context: DefaultThemeRenderContext, props: DeclarationHierarchy) => (
-    <ul class="tsd-hierarchy">
-        {props.types.map((item, i, l) => (
-            <li>
-                {props.isTarget ? <span class="target">{item.toString()}</span> : context.type(item)}
-                {i === l.length - 1 && !!props.next && context.hierarchy(props.next)}
-            </li>
-        ))}
-    </ul>
+export const hierarchy = (context: DefaultThemeRenderContext, props: DeclarationHierarchy | undefined) => (
+    <>
+        {!!props && (
+            <section class="tsd-panel tsd-hierarchy">
+                <h4>Hierarchy</h4>
+                <ul class="tsd-hierarchy">
+                    {props.types.map((item, i, l) => (
+                        <li>
+                            {props.isTarget ? <span class="target">{item.toString()}</span> : context.type(item)}
+                            {i === l.length - 1 && !!props.next && context.hierarchy(props.next)}
+                        </li>
+                    ))}
+                </ul>
+            </section>
+        )}
+    </>
 );
diff --git a/src/lib/output/themes/default/partials/typeParameters.tsx b/src/lib/output/themes/default/partials/typeParameters.tsx
index 558b8e9de..fa4065a41 100644
--- a/src/lib/output/themes/default/partials/typeParameters.tsx
+++ b/src/lib/output/themes/default/partials/typeParameters.tsx
@@ -4,28 +4,33 @@ import { JSX } from "../../../../utils";
 
 export function typeParameters(context: DefaultThemeRenderContext, typeParameters: TypeParameterReflection[]) {
     return (
-        <ul class="tsd-type-parameters">
-            {typeParameters?.map((item) => (
-                <li>
-                    <h4>
-                        {item.varianceModifier ? `${item.varianceModifier} ` : ""}
-                        {item.name}
-                        {!!item.type && (
-                            <>
-                                <span class="tsd-signature-symbol"> extends </span>
-                                {context.type(item.type)}
-                            </>
-                        )}
-                        {!!item.default && (
-                            <>
-                                {" = "}
-                                {context.type(item.default)}
-                            </>
-                        )}
-                    </h4>
-                    {context.comment(item)}
-                </li>
-            ))}
-        </ul>
+        <>
+            <section class="tsd-panel tsd-type-parameters">
+                <h4>Type Parameters</h4>
+                <ul class="tsd-type-parameters">
+                    {typeParameters?.map((item) => (
+                        <li>
+                            <h4>
+                                {item.varianceModifier ? `${item.varianceModifier} ` : ""}
+                                {item.name}
+                                {!!item.type && (
+                                    <>
+                                        <span class="tsd-signature-symbol"> extends </span>
+                                        {context.type(item.type)}
+                                    </>
+                                )}
+                                {!!item.default && (
+                                    <>
+                                        {" = "}
+                                        {context.type(item.default)}
+                                    </>
+                                )}
+                            </h4>
+                            {context.comment(item)}
+                        </li>
+                    ))}
+                </ul>
+            </section>
+        </>
     );
 }
diff --git a/src/lib/output/themes/default/templates/reflection.tsx b/src/lib/output/themes/default/templates/reflection.tsx
index 2899e6ae3..183e66df9 100644
--- a/src/lib/output/themes/default/templates/reflection.tsx
+++ b/src/lib/output/themes/default/templates/reflection.tsx
@@ -16,20 +16,11 @@ export function reflectionTemplate(context: DefaultThemeRenderContext, props: Pa
                 <section class="tsd-panel tsd-comment">{context.comment(props.model)}</section>
             )}
 
-            {hasTypeParameters(props.model) && (
-                <section class="tsd-panel tsd-type-parameters">
-                    <h4>Type Parameters</h4>
-                    {context.typeParameters(props.model.typeParameters)}
-                </section>
-            )}
+            {hasTypeParameters(props.model) && <> {context.typeParameters(props.model.typeParameters)} </>}
             {props.model instanceof DeclarationReflection && (
                 <>
-                    {!!props.model.typeHierarchy && (
-                        <section class="tsd-panel tsd-hierarchy">
-                            <h4>Hierarchy</h4>
-                            {context.hierarchy(props.model.typeHierarchy)}
-                        </section>
-                    )}
+                    {context.hierarchy(props.model.typeHierarchy)}
+
                     {!!props.model.implementedTypes && (
                         <section class="tsd-panel">
                             <h4>Implements</h4>