diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index e1199a190..2853625ab 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -410,11 +410,13 @@ const User = RestModel.extend({
 
               summary.topics = summary.topic_ids.map(id => topicMap[id]);
 
-              summary.badges = summary.badges.map(ub => {
-                const badge = badgeMap[ub.badge_id];
-                badge.count = ub.count;
-                return badge;
-              });
+              if (summary.badges) {
+                summary.badges = summary.badges.map(ub => {
+                  const badge = badgeMap[ub.badge_id];
+                  badge.count = ub.count;
+                  return badge;
+                });
+              }
               return summary;
            });
   }
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index 4be285f4a..1c043d4b6 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -15,4 +15,8 @@ class UserSummarySerializer < ApplicationSerializer
   attributes :likes_given, :likes_received, :posts_read_count,
              :days_visited, :topic_count, :post_count
 
+
+  def include_badges?
+    SiteSetting.enable_badges
+  end
 end