diff --git a/app/assets/javascripts/angularjs/controllers/build_lists_controller.js b/app/assets/javascripts/angularjs/controllers/build_lists_controller.js
index f8d9f230b..9e873c589 100644
--- a/app/assets/javascripts/angularjs/controllers/build_lists_controller.js
+++ b/app/assets/javascripts/angularjs/controllers/build_lists_controller.js
@@ -30,7 +30,8 @@ RosaABF.controller('BuildListsController', ['$scope', '$http', '$location', '$ti
       // Grouping of build_lists
       _.each(results.build_lists, function(r){
         var bl = new BuildList(r, dictionary);
-        var key = bl.project_id + '-' + bl.group_id;
+        var key = bl.project_id + '-';
+        key += bl.group_id ? bl.group_id : (bl.commit_hash + '-' + bl.user_id);
         if (groups[key]) {
           groups[key].addRelated(bl);
         } else {