diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 27c3a227c..cdf354c48 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -143,16 +143,11 @@ export function LayoutDataProvider({
 		}));
 	}, [searchSpacesData]);
 
-	// Use searchSpace query result for active search space (more reliable than finding in list)
-	const activeSearchSpace: SearchSpace | null = searchSpace
-		? {
-				id: searchSpace.id,
-				name: searchSpace.name,
-				description: searchSpace.description,
-				isOwner: searchSpace.is_owner,
-				memberCount: searchSpace.member_count || 0,
-			}
-		: null;
+	// Find active search space from list (has is_owner and member_count)
+	const activeSearchSpace: SearchSpace | null = useMemo(() => {
+		if (!searchSpaceId || !searchSpaces.length) return null;
+		return searchSpaces.find((s) => s.id === Number(searchSpaceId)) ?? null;
+	}, [searchSpaceId, searchSpaces]);
 
 	// Transform chats
 	const chats: ChatItem[] = useMemo(() => {
diff --git a/surfsense_web/components/layout/ui/sheets/AllSearchSpacesSheet.tsx b/surfsense_web/components/layout/ui/sheets/AllSearchSpacesSheet.tsx
index f91dda83a..d144c79b3 100644
--- a/surfsense_web/components/layout/ui/sheets/AllSearchSpacesSheet.tsx
+++ b/surfsense_web/components/layout/ui/sheets/AllSearchSpacesSheet.tsx
@@ -217,7 +217,7 @@ export function AllSearchSpacesSheet({
 					<AlertDialogHeader>
 						<AlertDialogTitle>{t("delete_title")}</AlertDialogTitle>
 						<AlertDialogDescription>
-							{t("delete_confirm", { name: spaceToDelete?.name })}
+							{t("delete_confirm", { name: spaceToDelete?.name ?? "" })}
 						</AlertDialogDescription>
 					</AlertDialogHeader>
 					<AlertDialogFooter>