diff --git a/thrimbletrimmer/dashboard.html b/thrimbletrimmer/dashboard.html
index 7a25386..42cb42b 100644
--- a/thrimbletrimmer/dashboard.html
+++ b/thrimbletrimmer/dashboard.html
@@ -232,8 +232,8 @@
                     <td>${event.state}</td>
                     <td><a href="/thrimbletrimmer?id=${event.id}">Edit</a></td>
                     <td>${event.video_link ? "<a href='"+event.video_link+"'>Link</a>":""}</td>
-                    <td>${event.edit_time.substring(0,19)}</td>
-                    <td>${event.upload_time.substring(0,19)}</td>
+                    <td>${event.edit_time ? event.edit_time.substring(0,19):""}</td>
+                    <td>${event.upload_time ? event.upload_time.substring(0,19):""}</td>
                 `;
                 document.getElementById('QueueTable').appendChild(row);
             });