diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index 86ae3c07b..79a74a2ee 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -14,3 +14,13 @@ AVAILABLE_LANGUAGE_CODES.each do |c|
     I18n.fallbacks[c.to_sym] = [c.to_sym, DEFAULT_LANGUAGE.to_sym, :en]
   end
 end
+
+# Workaround for https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror
+module AbstractController
+  class I18nProxy
+    def initialize(i18n_config, lookup_context)
+      @i18n_config, @lookup_context = i18n_config, lookup_context
+      @i18n_config = @i18n_config.i18n_config if @i18n_config.respond_to?(:i18n_config)
+    end
+  end
+end