diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index e57b7a5619..66ade481f7 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -1,4 +1,6 @@
 {{! Client-side Mustache template for rendering zephyrs.}}
+{{#each zephyrs}}
+{{#with this}}
 {{#include_bookend}}
 <tr><td /><td /><td class="bookend" /></tr>
 {{/include_bookend}}
@@ -37,3 +39,5 @@
         <div class="zephyr_content">{{{content}}}</div>
     </td>
 </tr>
+{{/with}}
+{{/each}}
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 14785a26e9..aa4d11e794 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -655,10 +655,7 @@ function add_to_table(zephyrs, table_name, filter_function) {
         prev = zephyr;
     });
 
-    $.each(zephyrs_to_render, function (index, zephyr) {
-        var new_tr = $(templates.zephyr(zephyr));
-        table.append(new_tr);
-    });
+    table.append(templates.zephyr({'zephyrs': zephyrs_to_render}));
 
     $.each(zephyrs_to_render, function (index, zephyr) {
         register_huddle_onclick(get_zephyr_row(zephyr.id), zephyr.sender_email);