diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
index 3372aae0914..11e7019ed04 100644
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@@ -38,13 +38,14 @@ def active
 
     def timeout
       analytics.track_event(Analytics::SESSION_TIMED_OUT)
+      request_id = sp_session[:request_id]
       sign_out
       flash[:notice] = t(
         'session_timedout',
         app: APP_NAME,
         minutes: Figaro.env.session_timeout_in_minutes
       )
-      redirect_to root_url
+      redirect_to root_url(request_id: request_id)
     end
 
     private
diff --git a/spec/features/saml/loa1_sso_spec.rb b/spec/features/saml/loa1_sso_spec.rb
index 4e0b80685e7..e700001bc12 100644
--- a/spec/features/saml/loa1_sso_spec.rb
+++ b/spec/features/saml/loa1_sso_spec.rb
@@ -119,8 +119,10 @@
 
       visit saml_authn_request
       sp_request_id = ServiceProviderRequest.last.uuid
-      page.set_rack_session(sp: {})
-      visit new_user_session_url(request_id: sp_request_id)
+
+      visit timeout_path
+      expect(current_url).to eq root_url(request_id: sp_request_id)
+
       fill_in_credentials_and_submit(user.email, user.password)
       click_submit_default
       click_continue