diff --git a/components/app.js b/components/app.js
index 620d6b0..050b201 100644
--- a/components/app.js
+++ b/components/app.js
@@ -281,12 +281,16 @@ export default class App extends Component {
 	createBuffer(serverID, name) {
 		let client = this.clients.get(serverID);
 		let id = null;
+		let isNew = false;
 		this.setState((state) => {
 			let updated;
 			[id, updated] = State.createBuffer(state, name, serverID, client);
+			isNew = !!updated;
 			return updated;
 		});
-		this.syncBufferUnread(serverID, name);
+		if (isNew) {
+			this.syncBufferUnread(serverID, name);
+		}
 		return id;
 	}