diff --git a/assets/client.js b/assets/client.js
index e8b7a16..e0c942b 100644
--- a/assets/client.js
+++ b/assets/client.js
@@ -167,7 +167,13 @@ ws.onmessage = function(event) {
 		if (target == server.nick) {
 			target = msg.prefix.name;
 		}
-		createBuffer(target).addMessage(msg);
+		var buf;
+		if (target == "*") {
+			buf = serverBuffer;
+		} else {
+			buf = createBuffer(target);
+		}
+		buf.addMessage(msg);
 		break;
 	case "JOIN":
 		var channel = msg.params[0];