diff --git a/components/bounty-detail/bounty-detail-submissions-card.tsx b/components/bounty-detail/bounty-detail-submissions-card.tsx
index 8d5992c..96f9df4 100644
--- a/components/bounty-detail/bounty-detail-submissions-card.tsx
+++ b/components/bounty-detail/bounty-detail-submissions-card.tsx
@@ -57,8 +57,8 @@ export function BountyDetailSubmissionsCard({
     useState<BountySubmissionType | null>(null);
 
   const [prUrl, setPrUrl] = useState("");
-    const [submitComments, setSubmitComments] = useState("");
-    const [reviewComments, setReviewComments] = useState("");
+  const [submitComments, setSubmitComments] = useState("");
+  const [reviewComments, setReviewComments] = useState("");
   const reviewStatus = "APPROVED";
   const [transactionHash, setTransactionHash] = useState("");
 
@@ -66,7 +66,7 @@ export function BountyDetailSubmissionsCard({
   const reviewSubmission = useReviewSubmission();
   const markSubmissionPaid = useMarkSubmissionPaid();
 
-  const hasHydratedDraft = useRef(false);
+  const [isHydrated, setIsHydrated] = useState(false);
 
   // Load draft on mount
   useEffect(() => {
@@ -74,15 +74,18 @@ export function BountyDetailSubmissionsCard({
       setPrUrl(draft.formData.githubPullRequestUrl);
       setSubmitComments(draft.formData.comments);
     }
-    hasHydratedDraft.current = true;
+    setIsHydrated(true);
   }, [draft]);
 
   // Auto-save on form changes
   useEffect(() => {
-    if (!hasHydratedDraft.current) return;
-    const cleanup = autoSave({ githubPullRequestUrl: prUrl, comments: submitComments });
+    if (!isHydrated) return;
+    const cleanup = autoSave({
+      githubPullRequestUrl: prUrl,
+      comments: submitComments,
+    });
     return cleanup;
-  }, [prUrl, submitComments, autoSave]);
+  }, [prUrl, submitComments, autoSave, isHydrated]);
 
   const isOrgMember =
     (session?.user as ExtendedUser)?.organizations?.includes(
@@ -184,7 +187,8 @@ export function BountyDetailSubmissionsCard({
                   Submit your GitHub pull request URL.
                   {draft && (
                     <span className="block mt-1 text-xs text-blue-400">
-                      Draft restored from {new Date(draft.updatedAt).toLocaleString()}
+                      Draft restored from{" "}
+                      {new Date(draft.updatedAt).toLocaleString()}
                     </span>
                   )}
                 </DialogDescription>
diff --git a/docs/SUBMISSION_DRAFTS_EXAMPLE.tsx b/docs/SUBMISSION_DRAFTS_EXAMPLE.tsx
index cb5c256..c0fb51e 100644
--- a/docs/SUBMISSION_DRAFTS_EXAMPLE.tsx
+++ b/docs/SUBMISSION_DRAFTS_EXAMPLE.tsx
@@ -1,6 +1,6 @@
 /**
  * Submission Draft System - Quick Start Example
- * 
+ *
  * This example shows how to integrate the submission draft system
  * into any form component.
  */
@@ -10,27 +10,31 @@ import { useSubmissionDraft } from "@/hooks/use-submission-draft";
 
 export function SubmissionFormExample({ bountyId }: { bountyId: string }) {
   const { draft, clearDraft, autoSave } = useSubmissionDraft(bountyId);
-  
-  const [prUrl, setPrUrl] = useState(draft?.formData.githubPullRequestUrl || "");
+
+  const [prUrl, setPrUrl] = useState(
+    draft?.formData.githubPullRequestUrl || "",
+  );
   const [comments, setComments] = useState(draft?.formData.comments || "");
 
   // 2. Auto-save when form changes
   useEffect(() => {
-    const cleanup = autoSave({ 
-      githubPullRequestUrl: prUrl, 
-      comments 
+    const cleanup = autoSave({
+      githubPullRequestUrl: prUrl,
+      comments,
     });
     return cleanup;
   }, [prUrl, comments, autoSave]);
 
   // 3. Clear draft on successful submit
-  const handleSubmit = async () => {
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+
     // Your submit logic here
     await submitToAPI({ prUrl, comments });
-    
+
     // Clear draft after success
     clearDraft();
-    
+
     // Reset form
     setPrUrl("");
     setComments("");
@@ -44,19 +48,19 @@ export function SubmissionFormExample({ bountyId }: { bountyId: string }) {
           Draft saved at {new Date(draft.updatedAt).toLocaleString()}
         </div>
       )}
-      
+
       <input
         value={prUrl}
         onChange={(e) => setPrUrl(e.target.value)}
         placeholder="Pull Request URL"
       />
-      
+
       <textarea
         value={comments}
         onChange={(e) => setComments(e.target.value)}
         placeholder="Comments"
       />
-      
+
       <button type="submit">Submit</button>
     </form>
   );
diff --git a/hooks/__tests__/use-submission-draft.test.ts b/hooks/__tests__/use-submission-draft.test.ts
index 8754752..573494e 100644
--- a/hooks/__tests__/use-submission-draft.test.ts
+++ b/hooks/__tests__/use-submission-draft.test.ts
@@ -49,7 +49,8 @@ describe("useSubmissionDraft", () => {
     expect(result.current.draft).toBeNull();
   });
 
-  it("should auto-save after delay", async () => {
+  it("should auto-save after delay", () => {
+    jest.useFakeTimers();
     const { result } = renderHook(() => useSubmissionDraft(bountyId));
     const formData = {
       githubPullRequestUrl: "https://github.com/test/pr/1",
@@ -60,12 +61,12 @@ describe("useSubmissionDraft", () => {
       result.current.autoSave(formData);
     });
 
-    await waitFor(
-      () => {
-        expect(result.current.draft?.formData).toEqual(formData);
-      },
-      { timeout: 1500 }
-    );
+    act(() => {
+      jest.advanceTimersByTime(1000); // AUTO_SAVE_DELAY
+    });
+
+    expect(result.current.draft?.formData).toEqual(formData);
+    jest.useRealTimers();
   });
 
   it("should persist draft across hook instances", () => {
diff --git a/hooks/use-submission-draft.ts b/hooks/use-submission-draft.ts
index a3574ad..017f1c3 100644
--- a/hooks/use-submission-draft.ts
+++ b/hooks/use-submission-draft.ts
@@ -7,7 +7,10 @@ const AUTO_SAVE_DELAY = 1000;
 
 export function useSubmissionDraft(bountyId: string) {
   const draftKey = `${DRAFT_KEY_PREFIX}${bountyId}`;
-  const [draft, setDraft] = useLocalStorage<SubmissionDraft | null>(draftKey, null);
+  const [draft, setDraft] = useLocalStorage<SubmissionDraft | null>(
+    draftKey,
+    null,
+  );
 
   const saveDraft = useCallback(
     (formData: SubmissionForm) => {
@@ -19,7 +22,7 @@ export function useSubmissionDraft(bountyId: string) {
       };
       setDraft(newDraft);
     },
-    [bountyId, setDraft]
+    [bountyId, setDraft],
   );
 
   const clearDraft = useCallback(() => {
@@ -29,13 +32,11 @@ export function useSubmissionDraft(bountyId: string) {
   const autoSave = useCallback(
     (formData: SubmissionForm) => {
       const timer = setTimeout(() => {
-        if (formData.githubPullRequestUrl || formData.comments) {
-          saveDraft(formData);
-        }
+        saveDraft(formData);
       }, AUTO_SAVE_DELAY);
       return () => clearTimeout(timer);
     },
-    [saveDraft]
+    [saveDraft],
   );
 
   return {
diff --git a/package-lock.json b/package-lock.json
index 2014dce..9adb979 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -188,7 +188,6 @@
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -1170,7 +1169,6 @@
       "version": "1.4.18",
       "resolved": "https://registry.npmjs.org/@better-auth/core/-/core-1.4.18.tgz",
       "integrity": "sha512-q+awYgC7nkLEBdx2sW0iJjkzgSHlIxGnOpsN1r/O1+a4m7osJNHtfK2mKJSL1I+GfNyIlxJF8WvD/NLuYMpmcg==",
-      "peer": true,
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "zod": "^4.3.5"
@@ -1200,14 +1198,12 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@better-auth/utils/-/utils-0.3.0.tgz",
       "integrity": "sha512-W+Adw6ZA6mgvnSnhOki270rwJ42t4XzSK6YWGF//BbVXL6SwCLWfyzBc1lN2m/4RM28KubdBKQ4X5VMoLRNPQw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@better-fetch/fetch": {
       "version": "1.1.21",
       "resolved": "https://registry.npmjs.org/@better-fetch/fetch/-/fetch-1.1.21.tgz",
-      "integrity": "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A==",
-      "peer": true
+      "integrity": "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
@@ -1321,7 +1317,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1345,7 +1340,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -8043,7 +8037,6 @@
       "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.21.tgz",
       "integrity": "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@tanstack/query-core": "5.90.20"
       },
@@ -8078,7 +8071,6 @@
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -8465,7 +8457,6 @@
       "integrity": "sha512-Rs1bVAIdBs5gbTIKza/tgpMuG1k3U/UMJLWecIMxNdJFDMzcM5LOiLVRYh3PilWEYDIeUDv7bpiHPLPsbydGcw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -8475,7 +8466,6 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
       "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -8486,7 +8476,6 @@
       "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -8583,7 +8572,6 @@
       "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.0",
         "@typescript-eslint/types": "8.56.0",
@@ -9270,7 +9258,6 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -9969,7 +9956,6 @@
       "resolved": "https://registry.npmjs.org/better-call/-/better-call-1.1.8.tgz",
       "integrity": "sha512-XMQ2rs6FNXasGNfMjzbyroSwKwYbZ/T3IxruSS6U2MJRsSYh3wYtG3o6H00ZlKZ/C/UPOAD97tqgQJNsxyeTXw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@better-auth/utils": "^0.3.0",
         "@better-fetch/fetch": "^1.1.4",
@@ -10029,7 +10015,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -11292,8 +11277,7 @@
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
       "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/embla-carousel-react": {
       "version": "8.6.0",
@@ -11648,7 +11632,6 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -11850,7 +11833,6 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -12869,7 +12851,6 @@
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
       "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -15390,7 +15371,6 @@
       "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz",
       "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -15420,7 +15400,6 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -15554,7 +15533,6 @@
       "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.11.tgz",
       "integrity": "sha512-zpGIFg0HuoC893rIjYX1BETkVWdDnzTzF5e0kWXJFg5lE0k1/LfNWBejrcnOFu8Q2Rfq/hTDTU7XLUM8QOrpzg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=20.0.0"
       }
@@ -17341,7 +17319,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^20.0.0 || >=22.0.0"
       }
@@ -17374,7 +17351,6 @@
       "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
       "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@next/env": "16.1.6",
         "@swc/helpers": "0.5.15",
@@ -18597,7 +18573,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
       "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18628,7 +18603,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
       "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -18641,7 +18615,6 @@
       "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.71.1.tgz",
       "integrity": "sha512-9SUJKCGKo8HUSsCO+y0CtqkqI5nNuaDqTxyqPsZPqIwudpj4rCrAz/jZV+jn57bx5gtZKOh3neQu94DXMc+w5w==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
@@ -20196,8 +20169,7 @@
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.0.tgz",
       "integrity": "sha512-yYzTZ4++b7fNYxFfpnberEEKu43w44aqDMNM9MHMmcKuCH7lL8jJ4yJ7LGHv7rSwiqM0nkiobF9I6cLlpS2P7Q==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/tapable": {
       "version": "2.3.0",
@@ -20324,7 +20296,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -20464,7 +20435,6 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -20675,7 +20645,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -21137,7 +21106,6 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -21231,7 +21199,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -21245,7 +21212,6 @@
       "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vitest/expect": "4.0.18",
         "@vitest/mocker": "4.0.18",
@@ -21715,7 +21681,6 @@
       "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -21897,7 +21862,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }