diff --git a/ts/challenge.ts b/ts/challenge.ts
index f4b35fe583..9a22a39e41 100644
--- a/ts/challenge.ts
+++ b/ts/challenge.ts
@@ -400,7 +400,11 @@ export class ChallengeHandler {
         `challenge(${reason}): challenge failure, error:`,
         Errors.toLogFormat(error)
       );
-      this.options.setChallengeStatus('required');
+      if (error.code === 413 || error.code === 429) {
+        this.options.setChallengeStatus('idle');
+      } else {
+        this.options.setChallengeStatus('required');
+      }
       this.solving -= 1;
       return;
     }