diff --git a/client/src/pages/QuizPage.tsx b/client/src/pages/QuizPage.tsx
index 718eb9a..b812cb0 100644
--- a/client/src/pages/QuizPage.tsx
+++ b/client/src/pages/QuizPage.tsx
@@ -21,5 +21,7 @@ export default function QuizPage() {
 
   const defaultMode = mode === 'entry' ? 'single' : mode === 'selected' ? 'selected' : 'all';
 
-  return <QuizRunner defaultMode={defaultMode} defaultEntryId={entryId} />;
+  const autoStart = mode === 'entry' && !!entryId;
+
+  return <QuizRunner defaultMode={defaultMode} defaultEntryId={entryId} autoStart={autoStart} />;
 }