diff --git a/app/course/[course_id]/office-hours/[queue_id]/new/newRequestForm.tsx b/app/course/[course_id]/office-hours/[queue_id]/new/newRequestForm.tsx
index 067e5ce99..d97b41c3c 100644
--- a/app/course/[course_id]/office-hours/[queue_id]/new/newRequestForm.tsx
+++ b/app/course/[course_id]/office-hours/[queue_id]/new/newRequestForm.tsx
@@ -695,6 +695,12 @@ export default function HelpRequestForm() {
     );
   }
 
+  // Compute hasErrors, ignoring empty root object left by React Hook Form
+  const hasErrors = Object.keys(errors).some(
+    (key) =>
+      key !== "root" || (key === "root" && Object.keys((errors as Record<string, unknown>).root || {}).length > 0)
+  );
+
   return (
     <form onSubmit={onSubmit} aria-label="New Help Request Form">
       <Toaster />
@@ -1229,7 +1235,7 @@ export default function HelpRequestForm() {
         <Button
           type="submit"
           loading={isSubmitting || isSubmittingGuard}
-          disabled={isSubmitting || isSubmittingGuard || Object.keys(errors).length > 0}
+          disabled={isSubmitting || isSubmittingGuard || hasErrors}
           mt={4}
         >
           Submit Request
diff --git a/lib/test-insights/RegradeSubmissionsDialog.tsx b/lib/test-insights/RegradeSubmissionsDialog.tsx
index 3d79f1616..56f108d48 100644
--- a/lib/test-insights/RegradeSubmissionsDialog.tsx
+++ b/lib/test-insights/RegradeSubmissionsDialog.tsx
@@ -217,6 +217,11 @@ export function RegradeSubmissionsDialog({
 
   // Handle regrade action
   const handleRegrade = useCallback(async () => {
+    // Early guard to prevent duplicate calls
+    if (isRegrading) {
+      return;
+    }
+
     if (errorGroup.affected_submission_ids.length === 0) {
       toaster.error({
         title: "Error",
@@ -254,7 +259,16 @@ export function RegradeSubmissionsDialog({
     } finally {
       setIsRegrading(false);
     }
-  }, [errorGroup.affected_submission_ids, courseId, manualSha, selectedCommit, autoPromote, supabase, onClose]);
+  }, [
+    errorGroup.affected_submission_ids,
+    courseId,
+    manualSha,
+    selectedCommit,
+    autoPromote,
+    supabase,
+    onClose,
+    isRegrading
+  ]);
 
   return (
     <Dialog.Root open={isOpen} onOpenChange={({ open }) => !open && onClose()} size="xl">
@@ -453,7 +467,7 @@ export function RegradeSubmissionsDialog({
                 colorPalette="green"
                 onClick={handleRegrade}
                 loading={isRegrading}
-                disabled={errorGroup.affected_submission_ids.length === 0}
+                disabled={isRegrading || errorGroup.affected_submission_ids.length === 0}
               >
                 <Icon as={FaPlay} mr={2} />
                 Regrade {errorGroup.affected_submission_ids.length} Submissions