diff --git a/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx b/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
index c84458edc..75fc836b4 100644
--- a/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
+++ b/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
@@ -74,12 +74,10 @@ const BugHuntIntakeForm: React.FC = () => {
         if (!workId && !challenge) {
             formOnReset(formInputs, formValues)
         }
-    }, [
-        challenge,
-        formInputs,
-        formValues,
-        workId,
-    ])
+        // Disabling lint rule as we only want this to run one time when component mounts, otherwise it resets
+        // the form for a user that is not logged in and has no challenge created yet
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
 
     useEffect(() => {
 
diff --git a/src-ts/tools/work/work-self-service/intake-forms/review/Review.tsx b/src-ts/tools/work/work-self-service/intake-forms/review/Review.tsx
index ea037e5e0..fb13a1f40 100644
--- a/src-ts/tools/work/work-self-service/intake-forms/review/Review.tsx
+++ b/src-ts/tools/work/work-self-service/intake-forms/review/Review.tsx
@@ -102,11 +102,9 @@ const Review: FC = () => {
             })
         }
         getAndSetWork()
-    }, [
-        formFieldValues,
-        userProfile,
-        workId,
-    ])
+        // Disabling to avoid infite re-renders
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [workId])
 
     useEffect(() => {
         setFormValues({
@@ -114,10 +112,9 @@ const Review: FC = () => {
             email: profile?.email || '',
             name: `${profile?.firstName} ${profile?.lastName}`,
         })
-    }, [
-        formFieldValues,
-        profile,
-    ])
+        // Disabling to avoid infite re-renders
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [profile])
 
     const onUpdateField: (fieldName: string, value: string | boolean) => void = (fieldName, value) => {
         setFormValues({