diff --git a/frontends/nextjs/src/lib/db/components/hierarchy/get-component-hierarchy.ts b/frontends/nextjs/src/lib/db/components/hierarchy/get-component-hierarchy.ts
index ee35689d0..a7c59c4c9 100644
--- a/frontends/nextjs/src/lib/db/components/hierarchy/get-component-hierarchy.ts
+++ b/frontends/nextjs/src/lib/db/components/hierarchy/get-component-hierarchy.ts
@@ -18,7 +18,7 @@ export async function getComponentHierarchy(): Promise<Record<string, ComponentN
     hierarchy[node.id] = {
       id: node.id,
       type: node.type,
-      parentId: node.parentId !== null && node.parentId !== undefined ? node.parentId : undefined,
+      parentId: node.parentId ?? undefined,
       childIds: JSON.parse(node.childIds) as string[],
       order: node.order,
       pageId: node.pageId,
diff --git a/frontends/nextjs/src/lib/rendering/declarative-component-renderer.ts b/frontends/nextjs/src/lib/rendering/declarative-component-renderer.ts
index b8f79dac7..7c2845a64 100644
--- a/frontends/nextjs/src/lib/rendering/declarative-component-renderer.ts
+++ b/frontends/nextjs/src/lib/rendering/declarative-component-renderer.ts
@@ -19,22 +19,22 @@ const PACKAGE_COMPONENT_REGISTRY: Record<string, Record<string, ComponentDef>> =
  * and a `components` array (or object) with component definitions.
  */
 export function loadPackageComponents(packageContent: JsonValue): void {
-  if (packageContent === null || packageContent === undefined || typeof packageContent !== 'object') return
+  if (typeof packageContent !== 'object' || packageContent === null) return
 
   const pkg = packageContent as JsonObject
-  const metadata = pkg?.metadata
+  const metadata = pkg.metadata
   const packageId =
     (metadata !== null && metadata !== undefined && typeof metadata === 'object' && !Array.isArray(metadata)
       ? (metadata as JsonObject)['packageId']
       : undefined) ?? 
-    pkg?.['package'] ?? 
-    pkg?.['packageId']
+    pkg['package'] ?? 
+    pkg['packageId']
   if (packageId === null || packageId === undefined || typeof packageId !== 'string') return
 
   const compsArray: JsonValue[] =
     Array.isArray(pkg.components) && pkg.components.length > 0
       ? pkg.components
-      : Array.isArray((pkg.ui as JsonObject)?.components)
+      : Array.isArray((pkg.ui as JsonObject | undefined)?.components)
       ? ((pkg.ui as JsonObject).components as JsonValue[])
       : []