diff --git a/app/components/contribution-list/component.js b/app/components/contribution-list/component.js
index 85491af..24cf332 100644
--- a/app/components/contribution-list/component.js
+++ b/app/components/contribution-list/component.js
@@ -73,6 +73,7 @@ export default Component.extend({
           .filter(Boolean);
 
         return EmberObject.create({
+          key: raw.groupId || `c-${first.id}`,
           groupId: raw.groupId,
           items,
           contributors,
diff --git a/app/components/contribution-list/template.hbs b/app/components/contribution-list/template.hbs
index e536656..4359668 100644
--- a/app/components/contribution-list/template.hbs
+++ b/app/components/contribution-list/template.hbs
@@ -30,7 +30,7 @@
 {{/if}}
 
 <ul class="item-list contribution-list {{if @loading 'loading'}}">
-  {{#each this.groupedContributions as |group|}}
+  {{#each this.groupedContributions key="key" as |group|}}
     {{#if group.isGrouped}}
       <li role="button" data-group-id={{group.groupId}}
           {{action "toggleGroup" group}}
@@ -77,7 +77,7 @@
         {{/each}}
       {{/if}}
     {{else}}
-      {{#each group.items as |contribution|}}
+      {{#each group.items key="id" as |contribution|}}
         <li role="button" data-contribution-id={{contribution.id}}
             {{action "openContributionDetails" contribution}}
             class="{{item-status contribution}}{{if (eq contribution.id @selectedContributionId) " selected"}}">