From 37769050e536827eb44ec649f5fcb6a1958344eb Mon Sep 17 00:00:00 2001
From: henrygd <hank@henrygd.me>
Date: Sun, 5 Oct 2025 19:38:37 -0400
Subject: [PATCH] fix loading system with direct id url

---
 internal/site/src/components/routes/system.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/site/src/components/routes/system.tsx b/internal/site/src/components/routes/system.tsx
index 09758b2e..71cbf95b 100644
--- a/internal/site/src/components/routes/system.tsx
+++ b/internal/site/src/components/routes/system.tsx
@@ -189,13 +189,19 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 
 	// find matching system and update when it changes
 	useEffect(() => {
+		if (!systems.length) {
+			return
+		}
+		// allow old system-name slug to work
 		const store = $allSystemsById.get()[id] ? $allSystemsById : $allSystemsByName
 		return subscribeKeys(store, [id], (newSystems) => {
 			const sys = newSystems[id]
-			document.title = `${sys?.name} / Beszel`
-			sys?.id && setSystem(sys)
+			if (sys) {
+				setSystem(sys)
+				document.title = `${sys?.name} / Beszel`
+			}
 		})
-	}, [id])
+	}, [id, systems.length])
 
 	// hide 1m chart time if system agent version is less than 0.13.0
 	useEffect(() => {