diff --git a/components/app.js b/components/app.js
index 5187df9..661b8b6 100644
--- a/components/app.js
+++ b/components/app.js
@@ -598,9 +598,6 @@ export default class App extends Component {
 		// operators and can contain important information.
 		msg.isHighlight = irc.isHighlight(msg, client.nick, client.cm) || irc.isServerBroadcast(msg);
 
-		if (!msg.tags) {
-			msg.tags = {};
-		}
 		if (!msg.tags.time) {
 			msg.tags.time = irc.formatDate(new Date());
 		}
diff --git a/lib/client.js b/lib/client.js
index 03eb519..c6dfcb8 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -295,6 +295,9 @@ export default class Client extends EventTarget {
 		if (!msg.prefix) {
 			msg.prefix = this.serverPrefix;
 		}
+		if (!msg.tags) {
+			msg.tags = {};
+		}
 
 		let msgBatch = null;
 		if (msg.tags["batch"]) {