diff --git a/Sources/Authenticator/Authenticator.swift b/Sources/Authenticator/Authenticator.swift
index 3607022..b0d1fbb 100644
--- a/Sources/Authenticator/Authenticator.swift
+++ b/Sources/Authenticator/Authenticator.swift
@@ -245,6 +245,12 @@ public struct Authenticator<LoadingContent: View,
             }
         }
         .onReceive(state.$step) {
+            // Currently, the only Step that can transition to itself is `.confirmSignUp(deliveryDetails)`,
+            // when new delivery details are populated by requesting a new code.
+            // We don't want to re-draw the Authenticator on said situations, so ignore it.
+            guard $0.authenticatorStep != self.currentStep.authenticatorStep else {
+                return
+            }
             self.previousStep = self.currentStep
             self.currentStep = $0
         }
diff --git a/Sources/Authenticator/States/ConfirmSignUpState.swift b/Sources/Authenticator/States/ConfirmSignUpState.swift
index b2e4e64..9c9230d 100644
--- a/Sources/Authenticator/States/ConfirmSignUpState.swift
+++ b/Sources/Authenticator/States/ConfirmSignUpState.swift
@@ -65,6 +65,7 @@ public class ConfirmSignUpState: AuthenticatorBaseState {
             )
 
             setMessage(.info(message: localizedMessage(for: details)))
+            authenticatorState.setCurrentStep(.confirmSignUp(deliveryDetails: details))
         } catch {
             log.error("Unable to resend the Sign Up confirmation code")
             let authenticationError = self.error(for: error)