diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 88388bfac..9c17abaa9 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -315,7 +315,8 @@ class BadgeGranter
                          title NOT IN (
                             SELECT name
                             FROM badges
-                            WHERE allow_title AND enabled
+                            WHERE allow_title AND enabled AND
+                              badges.id IN (SELECT badge_id FROM user_badges ub where ub.user_id = users.id)
                         )
                    ")
   end