diff --git a/components/app.js b/components/app.js
index 6f0e856..35c661d 100644
--- a/components/app.js
+++ b/components/app.js
@@ -224,18 +224,15 @@ export default class App extends Component {
 		}, callback);
 	}
 
-	createBuffer(serverID, name, callback) {
+	createBuffer(serverID, name) {
 		var id = null;
 		this.setState((state) => {
 			var client = this.clients.get(serverID);
 			var updated;
 			[id, updated] = State.createBuffer(state, name, serverID, client);
 			return updated;
-		}, () => {
-			if (callback) {
-				callback(id);
-			}
 		});
+		return id;
 	}
 
 	switchBuffer(id) {