diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0837ee4d78..140d39d28b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -38,7 +38,6 @@ Style/FetchEnvVar:
     - 'config/initializers/2_limited_federation_mode.rb'
     - 'config/initializers/3_omniauth.rb'
     - 'config/initializers/cache_buster.rb'
-    - 'config/initializers/devise.rb'
     - 'config/initializers/paperclip.rb'
     - 'lib/tasks/repo.rake'
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a277ee3059..6ea69e31bb 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -377,7 +377,7 @@ Devise.setup do |config|
     config.usernamefield          = nil
     config.emailfield             = 'email'
     config.check_at_sign          = true
-    config.pam_default_suffix     = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV['LOCAL_DOMAIN'] }
+    config.pam_default_suffix     = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV.fetch('LOCAL_DOMAIN', nil) }
     config.pam_default_service    = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' }
     config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE', nil).presence
   end