diff --git a/apps/web-roo-code/src/app/evals/recommendations/page.tsx b/apps/web-roo-code/src/app/evals/recommendations/page.tsx
index ea3739068a..035b44a417 100644
--- a/apps/web-roo-code/src/app/evals/recommendations/page.tsx
+++ b/apps/web-roo-code/src/app/evals/recommendations/page.tsx
@@ -1,3 +1,4 @@
+import { Suspense } from "react"
 import type { Metadata } from "next"
 import { redirect } from "next/navigation"
 
@@ -82,8 +83,8 @@ export default async function RecommendationsPage({ searchParams }: PageProps) {
 	const recommendations = getAllRecommendations()
 
 	// Aggregate totals
-	const totalEvalRuns = recommendations.reduce((sum, recommendation) => sum + recommendation.totalEvalRuns, 0)
-	const totalExercises = recommendations.reduce((sum, recommendation) => sum + recommendation.totalExercises, 0)
+	const totalEvalRuns = recommendations[0]?.totalEvalRuns ?? 0
+	const totalExercises = recommendations[0]?.totalExercises ?? 0
 	const uniqueModels = new Set(
 		recommendations.flatMap((recommendation) => recommendation.allCandidates.map((candidate) => candidate.modelId)),
 	)
@@ -95,15 +96,17 @@ export default async function RecommendationsPage({ searchParams }: PageProps) {
 		.pop()
 
 	return (
-		<WorkersContent
-			roles={roles}
-			recommendations={recommendations}
-			totalEvalRuns={totalEvalRuns}
-			totalExercises={totalExercises}
-			totalModels={totalModels}
-			lastUpdated={lastUpdated}
-			workersRootPath="/evals/recommendations"
-			roleBasePath="/evals/recommendations/roles"
-		/>
+		<Suspense>
+			<WorkersContent
+				roles={roles}
+				recommendations={recommendations}
+				totalEvalRuns={totalEvalRuns}
+				totalExercises={totalExercises}
+				totalModels={totalModels}
+				lastUpdated={lastUpdated}
+				workersRootPath="/evals/recommendations"
+				roleBasePath="/evals/recommendations/roles"
+			/>
+		</Suspense>
 	)
 }
diff --git a/apps/web-roo-code/src/app/evals/workers/page.tsx b/apps/web-roo-code/src/app/evals/workers/page.tsx
index 4f1d5f488a..e71a5b0d18 100644
--- a/apps/web-roo-code/src/app/evals/workers/page.tsx
+++ b/apps/web-roo-code/src/app/evals/workers/page.tsx
@@ -1,3 +1,4 @@
+import { Suspense } from "react"
 import type { Metadata } from "next"
 
 import { SEO } from "@/lib/seo"
@@ -75,14 +76,16 @@ export default function WorkersPage() {
 		.pop()
 
 	return (
-		<WorkersContent
-			roles={roles}
-			recommendations={recommendations}
-			totalEvalRuns={totalEvalRuns}
-			totalExercises={totalExercises}
-			totalModels={totalModels}
-			lastUpdated={lastUpdated}
-			workersRootPath="/evals/workers"
-		/>
+		<Suspense>
+			<WorkersContent
+				roles={roles}
+				recommendations={recommendations}
+				totalEvalRuns={totalEvalRuns}
+				totalExercises={totalExercises}
+				totalModels={totalModels}
+				lastUpdated={lastUpdated}
+				workersRootPath="/evals/workers"
+			/>
+		</Suspense>
 	)
 }