diff --git a/app/models/mention.rb b/app/models/mention.rb
index 2c6c95750..cbf4ad1b3 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -5,7 +5,7 @@ class Mention < ApplicationRecord
   belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
 
-  after_create :add_mentionee_as_watcher
+  after_create_commit :add_mentionee_as_watcher
 
   def self_mention?
     mentioner == mentionee