diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 14cf7c162..8f6c31c78 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -29,7 +29,8 @@ Rails.application.config.middleware.use OmniAuth::Builder do
                if settings
                  # Configure the strategy options dynamically
                  env['omniauth.strategy'].options[:assertion_consumer_service_url] = "#{ENV.fetch('FRONTEND_URL', 'http://localhost:3000')}/omniauth/saml/callback?account_id=#{account_id}"
-                 env['omniauth.strategy'].options[:sp_entity_id] = settings.sp_entity_id_or_default
+                 env['omniauth.strategy'].options[:sp_entity_id] = settings.sp_entity_id
+                 env['omniauth.strategy'].options[:idp_entity_id] = settings.idp_entity_id
                  env['omniauth.strategy'].options[:idp_sso_service_url] = settings.sso_url
                  env['omniauth.strategy'].options[:idp_cert] = settings.certificate
                  env['omniauth.strategy'].options[:name_identifier_format] = 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'