diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 5858fe1bb6fd2c813df588d984f51fdd64131f54..a46a593c6e3f695dbfe111c3f8fd11a915ca58c0 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -50,7 +50,7 @@ module Mentionable
     matches.each do |match|
       identifier = match.delete "@"
       if has_project
-        id = project.team.members.find { |u| u.username == identifier }.try(:id)
+        id = project.team.members.find_by(username: identifier).try(:id)
       else
         id = User.where(username: identifier).pluck(:id).first
       end