diff --git a/components/MonitorDetail.tsx b/components/MonitorDetail.tsx
index 66f95c6..41faad6 100644
--- a/components/MonitorDetail.tsx
+++ b/components/MonitorDetail.tsx
@@ -5,13 +5,16 @@ import DetailChart from './DetailChart'
 import DetailBar from './DetailBar'
 import { getColor } from '@/util/color'
 import { maintenances } from '@/uptime.config'
+import Link from 'next/link'
 
 export default function MonitorDetail({
   monitor,
   state,
+  link,
 }: {
   monitor: MonitorTarget
   state: MonitorState
+  link?: string
 }) {
   if (!state.latency[monitor.id])
     return (
@@ -65,10 +68,10 @@ export default function MonitorDetail({
   // Conditionally render monitor name with or without hyperlink based on monitor.url presence
   const monitorNameElement = (
     <Text mt="sm" fw={700} style={{ display: 'inline-flex', alignItems: 'center' }}>
-      {monitor.statusPageLink ? (
+      {link ? (
         <a
-          href={monitor.statusPageLink}
-          target="_blank"
+          href={link}
+          target={link.startsWith('/') ? '_self' : '_blank'}
           style={{ display: 'inline-flex', alignItems: 'center', color: 'inherit' }}
         >
           {statusIcon} {monitor.name}
diff --git a/components/MonitorList.tsx b/components/MonitorList.tsx
index f1f9d2f..f5815fc 100644
--- a/components/MonitorList.tsx
+++ b/components/MonitorList.tsx
@@ -76,7 +76,11 @@ export default function MonitorList({
                 .map((monitor) => (
                   <div key={monitor.id}>
                     <Card.Section ml="xs" mr="xs">
-                      <MonitorDetail monitor={monitor} state={state} />
+                      <MonitorDetail
+                        link={`/monitor/${monitor.id}`}
+                        monitor={monitor}
+                        state={state}
+                      />
                     </Card.Section>
                   </div>
                 ))}