diff --git a/hal-core/resources/web/js/hal.js b/hal-core/resources/web/js/hal.js
index 82a97de7..e731b2e7 100644
--- a/hal-core/resources/web/js/hal.js
+++ b/hal-core/resources/web/js/hal.js
@@ -51,6 +51,9 @@ $.fn.relTimestamp = function() {
 
 // Converts all timestamps to human readable time and date
 function getRelTimestamp(timestamp) {
+    if (timestamp == null)
+        return "";
+
     let timestampNow = Date.now();
     let timeDiff = timestampNow - timestamp;
 
diff --git a/hal-core/resources/web/js/vue/components/EventActionComponent.js b/hal-core/resources/web/js/vue/components/EventActionComponent.js
index 79df9d93..77550e31 100644
--- a/hal-core/resources/web/js/vue/components/EventActionComponent.js
+++ b/hal-core/resources/web/js/vue/components/EventActionComponent.js
@@ -17,8 +17,6 @@ export default {
             <input type="hidden" name="action-id" :value="event.id">
 
             <div class="btn-toolbar pull-right">
-                <template v-if="event.dataType === null">
-                </template>
                 <template v-else-if="event.dataType === 'ColorEventData'">
                     <input type="hidden" name="type" value="color">
                     <input type="color" name="data" onchange="this.form.submit()" :value="event.data?.valueStr">
diff --git a/hal-core/resources/web/js/vue/components/EventTableRowComponent.js b/hal-core/resources/web/js/vue/components/EventTableRowComponent.js
index 557720cc..0d7afc24 100644
--- a/hal-core/resources/web/js/vue/components/EventTableRowComponent.js
+++ b/hal-core/resources/web/js/vue/components/EventTableRowComponent.js
@@ -9,7 +9,7 @@ export default {
   let event = eventStore.getEvent(this.id)
     return {
         event: event,
-        timestamp: getRelTimestamp(event.data.timestamp)
+        timestamp: getRelTimestamp(event.data?.timestamp)
     }
   },
   components: {
@@ -19,7 +19,7 @@ export default {
     <tr :data-device-id="event.id">
         <td><a :href="'?id=' + event.id">{{ event.name }}</a></td>
         <td>{{ event.configType }}</td>
-        <td>{{ event.data.valueStr }}</td>
+        <td>{{ event.data?.valueStr }}</td>
         <td class="timestamp">{{ timestamp }}</td>
         <td>
             <EventAction :id="event.id"/>