diff --git a/src/components/MessageContent.js b/src/components/MessageContent.js
index ff4e23cf..d8fe78a8 100644
--- a/src/components/MessageContent.js
+++ b/src/components/MessageContent.js
@@ -24,6 +24,9 @@ export default Vue.component('MessageContent', {
  * All attributes other than `href` for links are stripped from the source
  */
 export function formatMessage(createElement, source) {
+	if (!source.tag) {
+		source.tag = []
+	}
 	let mentions = source.tag.filter(tag => tag.type === 'Mention')
 	let hashtags = source.tag.filter(tag => tag.type === 'Hashtag')
 
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index 3576b2ef..97f714c6 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="['timeline-entry', hasHeader ? 'with-header' : '']" @click="getSinglePostTimeline">
+	<div :class="['timeline-entry', hasHeader ? 'with-header' : '']">
 		<template v-if="item.type === 'SocialAppNotification'">
 			<div class="notification-icon" :class="notificationIcon" />
 			<span class="notification-action">