diff --git a/app/assets/javascripts/discourse/helpers/grouped_each.js b/app/assets/javascripts/discourse/helpers/grouped_each.js
index f0632acae86..218232acad7 100644
--- a/app/assets/javascripts/discourse/helpers/grouped_each.js
+++ b/app/assets/javascripts/discourse/helpers/grouped_each.js
@@ -78,8 +78,6 @@ DiscourseGroupedEach.prototype = {
         template = this.template;
 
     data.insideEach = true;
-    data.insideGroup = true;
-
     for (var i = 0; i < contentLength; i++) {
       template(content.objectAt(i), { data: data });
     }
@@ -124,5 +122,6 @@ Ember.Handlebars.registerHelper('groupedEach', function(path, options) {
   }
 
   options.hash.dataSourceBinding = path;
+  options.data.insideGroup = true;
   new DiscourseGroupedEach(this, path, options).render();
 });
\ No newline at end of file