diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index 0117a62d..3556326e 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -193,14 +193,22 @@
                         "targets": [8],
                         "data":"stopped",
                         "render": function ( data, type, full ) {
-                            return moment(data, "X").format("${time_format}");
+                            if (data !== null) {
+                                return moment(data, "X").format("${time_format}");
+                            } else {
+                                return data;
+                            }
                         }
                     },
                     {
                         "targets": [9],
                         "data":"duration",
                         "render": function ( data, type, full ) {
-                            return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins';
+                            if (data !== null) {
+                                return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins';
+                            } else {
+                                return data;
+                            }
                         }
                     },
                     {