diff --git a/components/app.js b/components/app.js
index 67db6ba..f9ef89d 100644
--- a/components/app.js
+++ b/components/app.js
@@ -629,9 +629,9 @@ export default class App extends Component {
 		case "JOIN":
 			channel = msg.params[0];
 
-			this.syncBufferUnread(serverID, channel);
-
-			if (!client.isMyNick(msg.prefix.name)) {
+			if (client.isMyNick(msg.prefix.name)) {
+				this.syncBufferUnread(serverID, channel);
+			} else {
 				this.addMessage(serverID, channel, msg);
 			}
 			if (channel == this.switchToChannel) {