diff --git a/src/app/evaluations/[id]/page.tsx b/src/app/evaluations/[id]/page.tsx
index bd1e453..552f087 100644
--- a/src/app/evaluations/[id]/page.tsx
+++ b/src/app/evaluations/[id]/page.tsx
@@ -333,8 +333,9 @@ export default function EvaluationDetailPage() {
       <div className="flex flex-wrap gap-3">
         <button
           onClick={() => {
-            setEvaluation((e) => (e ? { ...e, status: "submitted" } : null));
-            setTimeout(handleSave, 0);
+            const updated = evaluation ? { ...evaluation, status: "submitted" } : null;
+            setEvaluation(updated);
+            if (updated) handleSave(updated);
           }}
           className="rounded border border-emerald-500/50 bg-emerald-500/20 px-3 py-1.5 font-mono text-xs text-emerald-600 dark:text-emerald-400 hover:bg-emerald-500/30"
         >