diff --git a/core/templates/sys/logs.jinja b/core/templates/sys/logs.jinja
index 3f87fb8..3dfe531 100644
--- a/core/templates/sys/logs.jinja
+++ b/core/templates/sys/logs.jinja
@@ -17,6 +17,11 @@
             <th>Params</th>
         </tr>
     </thead>
+    {% if events is not defined or events|length == 0 %}
+    <tr>
+        <td colspan="10" style="text-align:center"><i>No Events</i></td>
+    </tr>
+    {% endif %}
 </table>
 <div id="div_tbl_ctrl">
 <select id="sel_per_page" onchange="update_tbl()">
@@ -40,6 +45,7 @@ var per_page = 0;
 var page = 0;
 
 function update_tbl() {
+    if (TBL_DATA.length == 0) { return; }
     var tbl = document.getElementById("tbl_events");
     
     for (var i = 0; i < per_page; i++) {