1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/concerns/async_devise_email.rb b/app/models/concerns/async_devise_email.rb
index 38c99dc7e71..7cdbed2eef6 100644
--- a/app/models/concerns/async_devise_email.rb
+++ b/app/models/concerns/async_devise_email.rb
@@ -2,6 +2,7 @@
 
 module AsyncDeviseEmail
   extend ActiveSupport::Concern
+  include AfterCommitQueue
 
   private
 
@@ -9,6 +10,8 @@ module AsyncDeviseEmail
   def send_devise_notification(notification, *args)
     return true unless can?(:receive_notifications)
 
-    devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend
+    run_after_commit_or_now do
+      devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend
+    end
   end
 end