diff --git a/app/controllers/concerns/idv_step_concern.rb b/app/controllers/concerns/idv_step_concern.rb
index d30fbda51d7..5b4926516aa 100644
--- a/app/controllers/concerns/idv_step_concern.rb
+++ b/app/controllers/concerns/idv_step_concern.rb
@@ -9,14 +9,20 @@ module IdvStepConcern
   included do
     before_action :confirm_two_factor_authenticated
     before_action :confirm_idv_needed
+    before_action :confirm_letter_recently_enqueued
     before_action :confirm_no_pending_gpo_profile
     before_action :confirm_no_pending_in_person_enrollment
     before_action :handle_fraud
     before_action :check_for_mail_only_outage
   end
 
+  def confirm_letter_recently_enqueued
+    # idv session should be clear when user returns to enter code
+    return redirect_to idv_letter_enqueued_url if letter_recently_enqueued?
+  end
+
   def confirm_no_pending_gpo_profile
-    redirect_to idv_verify_by_mail_enter_code_url if current_user&.gpo_verification_pending_profile?
+    redirect_to idv_verify_by_mail_enter_code_url if letter_not_recently_enqueued?
   end
 
   def confirm_no_pending_in_person_enrollment
@@ -120,6 +126,16 @@ def extra_analytics_properties
     extra
   end
 
+  def letter_recently_enqueued?
+    current_user&.gpo_verification_pending_profile? &&
+      idv_session.address_verification_mechanism == 'gpo'
+  end
+
+  def letter_not_recently_enqueued?
+    current_user&.gpo_verification_pending_profile? &&
+      !idv_session.address_verification_mechanism
+  end
+
   def flow_policy
     @flow_policy ||= Idv::FlowPolicy.new(idv_session: idv_session, user: current_user)
   end
diff --git a/app/controllers/idv/by_mail/request_letter_controller.rb b/app/controllers/idv/by_mail/request_letter_controller.rb
index 2bcfd919ff4..823278b38ba 100644
--- a/app/controllers/idv/by_mail/request_letter_controller.rb
+++ b/app/controllers/idv/by_mail/request_letter_controller.rb
@@ -1,12 +1,10 @@
 module Idv
   module ByMail
     class RequestLetterController < ApplicationController
-      include IdvSession
+      include IdvStepConcern
+      skip_before_action :confirm_no_pending_gpo_profile
       include Idv::StepIndicatorConcern
-      include Idv::AbTestAnalyticsConcern
 
-      before_action :confirm_two_factor_authenticated
-      before_action :confirm_idv_needed
       before_action :confirm_user_completed_idv_profile_step
       before_action :confirm_mail_not_rate_limited
       before_action :confirm_profile_not_too_old
diff --git a/spec/controllers/concerns/idv_step_concern_spec.rb b/spec/controllers/concerns/idv_step_concern_spec.rb
index 86e7a90ef47..9bae5a46998 100644
--- a/spec/controllers/concerns/idv_step_concern_spec.rb
+++ b/spec/controllers/concerns/idv_step_concern_spec.rb
@@ -319,6 +319,42 @@ def show
     end
   end
 
+  describe '#confirm_letter_recently_enqueued' do
+    controller(idv_step_controller_class) do
+      before_action :confirm_letter_recently_enqueued
+    end
+
+    before(:each) do
+      sign_in(user)
+      allow(subject).to receive(:current_user).and_return(user)
+      routes.draw do
+        get 'show' => 'anonymous#show'
+      end
+    end
+
+    context 'letter was not recently enqueued' do
+      it 'does not redirect' do
+        get :show
+
+        expect(response.body).to eq 'Hello'
+        expect(response).to_not redirect_to idv_letter_enqueued_url
+        expect(response.status).to eq 200
+      end
+    end
+
+    context 'letter was recently enqueued' do
+      let(:user) { create(:user, :with_pending_gpo_profile, :fully_registered) }
+
+      it 'redirects to letter enqueued page' do
+        idv_session.address_verification_mechanism = 'gpo'
+
+        get :show
+
+        expect(response).to redirect_to idv_letter_enqueued_url
+      end
+    end
+  end
+
   describe '#confirm_no_pending_in_person_enrollment' do
     controller(idv_step_controller_class) do
       before_action :confirm_no_pending_in_person_enrollment
diff --git a/spec/features/idv/end_to_end_idv_spec.rb b/spec/features/idv/end_to_end_idv_spec.rb
index f4281428750..86ae3b092ea 100644
--- a/spec/features/idv/end_to_end_idv_spec.rb
+++ b/spec/features/idv/end_to_end_idv_spec.rb
@@ -76,8 +76,9 @@
 
       complete_enter_password_step(user)
 
-      validate_come_back_later_page
-      complete_come_back_later
+      try_to_go_back_from_letter_enqueued
+      validate_letter_enqueued_page
+      complete_letter_enqueued
       validate_return_to_sp
 
       visit sign_out_url
@@ -275,7 +276,7 @@ def validate_enter_password_submit(user)
     expect(GpoConfirmation.count).to eq(0)
   end
 
-  def validate_come_back_later_page
+  def validate_letter_enqueued_page
     expect(page).to have_current_path(idv_letter_enqueued_path)
     expect_in_person_gpo_step_indicator_current_step(t('step_indicator.flows.idv.get_a_letter'))
     expect(page).to have_content(t('idv.titles.come_back_later'))
@@ -395,6 +396,13 @@ def try_to_go_back_from_verify_info
     expect(page).to have_current_path(idv_verify_info_path)
   end
 
+  def try_to_go_back_from_letter_enqueued
+    go_back
+    expect(page).to have_current_path(idv_letter_enqueued_path)
+    visit(idv_welcome_path)
+    expect(page).to have_current_path(idv_letter_enqueued_path)
+  end
+
   def same_phone?(phone1, phone2)
     PhoneFormatter.format(phone1) == PhoneFormatter.format(phone2)
   end
diff --git a/spec/features/idv/steps/request_letter_step_spec.rb b/spec/features/idv/steps/request_letter_step_spec.rb
index 7d6585aaf1b..b6cf6938eb2 100644
--- a/spec/features/idv/steps/request_letter_step_spec.rb
+++ b/spec/features/idv/steps/request_letter_step_spec.rb
@@ -87,13 +87,16 @@
 
         # Confirm that user cannot visit other IdV pages while unverified
         visit idv_agreement_path
-        expect(page).to have_current_path(idv_verify_by_mail_enter_code_path)
+        expect(page).to have_current_path(idv_letter_enqueued_path)
         visit idv_ssn_url
-        expect(page).to have_current_path(idv_verify_by_mail_enter_code_path)
+        expect(page).to have_current_path(idv_letter_enqueued_path)
         visit idv_verify_info_url
-        expect(page).to have_current_path(idv_verify_by_mail_enter_code_path)
+        expect(page).to have_current_path(idv_letter_enqueued_path)
 
         # complete verification: end to end gpo test
+        sign_out
+        sign_in_live_with_2fa(user)
+
         complete_gpo_verification(user)
         expect(user.identity_verified?).to be(true)
         expect(page).to_not have_content(t('account.index.verification.reactivate_button'))
@@ -158,7 +161,7 @@ def confirm_rate_limited
   context 'GPO verified user has reset their password and needs to re-verify with GPO again', :js do
     let(:user) { user_verified_with_gpo }
 
-    it 'shows the user a GPO index screen asking to send a letter' do
+    it 'shows the user the request letter page' do
       visit_idp_from_ial2_oidc_sp
       trigger_reset_password_and_click_email_link(user.email)
       reset_password_and_sign_back_in(user)
diff --git a/spec/support/features/doc_auth_helper.rb b/spec/support/features/doc_auth_helper.rb
index 7b1ada73532..cbd50b5c1b0 100644
--- a/spec/support/features/doc_auth_helper.rb
+++ b/spec/support/features/doc_auth_helper.rb
@@ -175,7 +175,7 @@ def complete_gpo_verification(user)
     click_button t('idv.gpo.form.submit')
   end
 
-  def complete_come_back_later
+  def complete_letter_enqueued
     # Exit Login.gov and return to SP
     click_on t('idv.cancel.actions.exit', app_name: APP_NAME)
   end