diff --git a/r2/r2/lib/validator/validator.py b/r2/r2/lib/validator/validator.py
index 47a38b4e9..82266a332 100644
--- a/r2/r2/lib/validator/validator.py
+++ b/r2/r2/lib/validator/validator.py
@@ -278,7 +278,7 @@ def _validatedForm(self, self_method, responder, simple_vals, param_vals,
     for validator in simple_vals:
         if (isinstance(validator, VCaptcha) and
             (form.has_errors('captcha', errors.BAD_CAPTCHA) or
-             form.has_error())):
+             (form.has_error() and c.user.needs_captcha()))):
             form.new_captcha()
         elif (isinstance(validator, VRatelimit) and
               form.has_errors('ratelimit', errors.RATELIMIT)):