diff --git a/app/decorators/service_provider_session_decorator.rb b/app/decorators/service_provider_session_decorator.rb
index 2ac15d8b033..cf9f35054ed 100644
--- a/app/decorators/service_provider_session_decorator.rb
+++ b/app/decorators/service_provider_session_decorator.rb
@@ -85,7 +85,7 @@ def sp_alert(section)
 
   def mfa_expiration_interval
     aal_1_expiration = IdentityConfig.store.remember_device_expiration_hours_aal_1.hours
-    aal_2_expiration = IdentityConfig.store.remember_device_expiration_hours_aal_2.hours
+    aal_2_expiration = IdentityConfig.store.remember_device_expiration_minutes_aal_2.minutes
     return aal_2_expiration if sp_aal > 1
     return aal_2_expiration if sp_ial > 1
     return aal_2_expiration if requested_aal > 1
diff --git a/config/application.yml.default b/config/application.yml.default
index e23bbd9a247..912583f490c 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -273,7 +273,7 @@ reg_unconfirmed_email_max_attempts: 20
 reg_unconfirmed_email_window_in_minutes: 60
 reject_id_token_hint_in_logout: false
 remember_device_expiration_hours_aal_1: 720
-remember_device_expiration_hours_aal_2: 0
+remember_device_expiration_minutes_aal_2: 0
 report_timeout: 0
 requests_per_ip_cidr_allowlist: ''
 requests_per_ip_limit: 300
diff --git a/lib/identity_config.rb b/lib/identity_config.rb
index 7932d8a3425..2ddfd89ae3f 100644
--- a/lib/identity_config.rb
+++ b/lib/identity_config.rb
@@ -397,7 +397,7 @@ def self.build_store(config_map)
     config.add(:reg_unconfirmed_email_window_in_minutes, type: :integer)
     config.add(:reject_id_token_hint_in_logout, type: :boolean)
     config.add(:remember_device_expiration_hours_aal_1, type: :integer)
-    config.add(:remember_device_expiration_hours_aal_2, type: :integer)
+    config.add(:remember_device_expiration_minutes_aal_2, type: :integer)
     config.add(:report_timeout, type: :integer)
     config.add(:requests_per_ip_cidr_allowlist, type: :comma_separated_string_list)
     config.add(:requests_per_ip_limit, type: :integer)
diff --git a/spec/features/remember_device/sp_expiration_spec.rb b/spec/features/remember_device/sp_expiration_spec.rb
index d7307451a8a..d8c6fb5a828 100644
--- a/spec/features/remember_device/sp_expiration_spec.rb
+++ b/spec/features/remember_device/sp_expiration_spec.rb
@@ -88,7 +88,7 @@ def visit_sp(protocol, aal)
   AAL1_REMEMBER_DEVICE_EXPIRATION =
     IdentityConfig.store.remember_device_expiration_hours_aal_1.hours
   AAL2_REMEMBER_DEVICE_EXPIRATION =
-    IdentityConfig.store.remember_device_expiration_hours_aal_2.hours
+    IdentityConfig.store.remember_device_expiration_minutes_aal_2.minutes
 
   let(:user) do
     user_record = sign_up_and_set_password