diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index b132c7af184..2bca12c518f 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -15,7 +15,7 @@ class BadgeGranter
 
     user_badge = UserBadge.find_by(badge_id: @badge.id, user_id: @user.id, post_id: @post_id)
 
-    if user_badge.nil? || @badge.multiple_grant?
+    if user_badge.nil? || (@badge.multiple_grant? && @post_id.nil?)
       UserBadge.transaction do
         user_badge = UserBadge.create!(badge: @badge, user: @user,
                                        granted_by: @granted_by,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 24274a88b6c..ef7be8491b4 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1933,10 +1933,10 @@ en:
           description: Received a like.
         nice_post:
           name: Nice Post
-          description: Received 10 likes on a post.
+          description: Received 10 likes on a post. This badge can be granted multiple times.
         good_post:
           name: Good Post
-          description: Received 25 likes on a post.
+          description: Received 25 likes on a post. This badge can be granted multiple times.
         great_post:
           name: Great Post
-          description: Received 100 likes on a post.
+          description: Received 100 likes on a post. This badge can be granted multiple times.
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index f893bd42cf6..a8f8499ff20 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -90,7 +90,9 @@ describe BadgeGranter do
       # Nice post badge
       post.update_attributes like_count: 10
       BadgeGranter.update_badges(action: :post_like, post_id: post.id)
+      BadgeGranter.update_badges(action: :post_like, post_id: post.id)
       UserBadge.find_by(user_id: user.id, badge_id: 6).should_not be_nil
+      UserBadge.where(user_id: user.id, badge_id: 6).count.should == 1
       # Good post badge
       post.update_attributes like_count: 25
       BadgeGranter.update_badges(action: :post_like, post_id: post.id)