diff --git a/components/app.js b/components/app.js
index 48dc72b..f92ea67 100644
--- a/components/app.js
+++ b/components/app.js
@@ -599,6 +599,10 @@ export default class App extends Component {
 			msg.isHighlight = irc.isHighlight(msg, client.nick, client.cm) || irc.isServerBroadcast(msg);
 		}
 
+		if (!msg.tags) {
+			// Can happen for outgoing messages for instance
+			msg.tags = {};
+		}
 		if (!msg.tags.time) {
 			msg.tags.time = irc.formatDate(new Date());
 		}