diff --git a/src/components/user_list_popover/user_list_popover.js b/src/components/user_list_popover/user_list_popover.js
index 26d2ed1a..b60f2c4c 100644
--- a/src/components/user_list_popover/user_list_popover.js
+++ b/src/components/user_list_popover/user_list_popover.js
@@ -7,6 +7,11 @@ const UserListPopover = {
   components: {
     Popover: () => import('../popover/popover.vue'),
     UserAvatar: () => import('../user_avatar/user_avatar.vue')
+  },
+  computed: {
+    usersCapped () {
+      return this.users.slice(0, 16)
+    }
   }
 }
 
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 6bd786b3..185c73ca 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -13,7 +13,7 @@
     >
       <div v-if="users.length">
         <div
-          v-for="(user) in users"
+          v-for="(user) in usersCapped"
           :key="user.id"
           class="user-list-row"
         >