diff --git a/components/MaintenanceAlert.tsx b/components/MaintenanceAlert.tsx
index 30f1bdf..8d76fd9 100644
--- a/components/MaintenanceAlert.tsx
+++ b/components/MaintenanceAlert.tsx
@@ -9,7 +9,7 @@ export default function MaintenanceAlert({
   style,
   upcoming = false,
 }: {
-  maintenance: Omit<MaintenanceConfig, 'monitors'> & { monitors?: MonitorTarget[] }
+  maintenance: Omit<MaintenanceConfig, 'monitors'> & { monitors?: (MonitorTarget | undefined)[] }
   style?: React.CSSProperties
   upcoming?: boolean
 }) {
@@ -81,7 +81,7 @@ export default function MaintenanceAlert({
           </Text>
           <List size="sm" withPadding>
             {maintenance.monitors.map((comp, compIdx) => (
-              <List.Item key={compIdx}>{comp.name}</List.Item>
+              <List.Item key={compIdx}>{comp?.name ?? '[ERR: MONITOR ID NOT FOUND]'}</List.Item>
             ))}
           </List>
         </>
diff --git a/components/OverallStatus.tsx b/components/OverallStatus.tsx
index f9941ac..5212291 100644
--- a/components/OverallStatus.tsx
+++ b/components/OverallStatus.tsx
@@ -72,7 +72,7 @@ export default function OverallStatus({
     }))
 
   const upcomingMaintenances: (Omit<MaintenanceConfig, 'monitors'> & {
-    monitors?: MonitorTarget[]
+    monitors?: (MonitorTarget | undefined)[]
   })[] = maintenances
     .filter((m) => now < new Date(m.start))
     .map((maintenance) => ({