diff --git a/config/initializers/mail_delivery_job.rb b/config/initializers/mail_delivery_job.rb
new file mode 100644
index 0000000000..4bab2000b0
--- /dev/null
+++ b/config/initializers/mail_delivery_job.rb
@@ -0,0 +1,13 @@
+module OpenStreetMap
+  module ActionMailer
+    module MailDeliveryJob
+      def perform(mailer, mail_method, delivery_method, *args, **kwargs)
+        kwargs = args.pop if kwargs.empty? && args.last.is_a?(Hash)
+
+        super(mailer, mail_method, delivery_method, *args, **kwargs)
+      end
+    end
+  end
+end
+
+ActionMailer::MailDeliveryJob.prepend(OpenStreetMap::ActionMailer::MailDeliveryJob)