diff --git a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
index 34b8d05b3..12c7eb818 100644
--- a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
+++ b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
@@ -42,11 +42,15 @@ const ChallengeModalPrompt: FunctionComponent<Props> = ({
         }
       }
 
+      if (typeof values[prompt.id].value === 'boolean') {
+        return
+      }
+
       biometricsButtonRef.current?.click()
     } else {
       inputRef.current?.focus()
     }
-  }, [application, prompt.validation])
+  }, [application, prompt.id, prompt.validation, values])
 
   useEffect(() => {
     if (!application.isNativeMobileWeb()) {