diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 5586ce024d..4f80a44ab5 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -335,6 +335,10 @@ function add_to_table(messages, table_name, filter_function, where, allow_collap
         prev = message;
     });
 
+    if (messages_to_render.length === 0) {
+        return;
+    }
+
     if (current_group.length > 0)
         new_message_groups.push(current_group);