diff --git a/components/app.js b/components/app.js
index ec1f732..7d556c9 100644
--- a/components/app.js
+++ b/components/app.js
@@ -12,6 +12,8 @@ import { BufferType, Status, Unread } from "/state.js";
 
 const SERVER_BUFFER = "*";
 
+var messagesCount = 0;
+
 function parseQueryString() {
 	var query = window.location.search.substring(1);
 	var params = {};
@@ -144,6 +146,9 @@ export default class App extends Component {
 	}
 
 	addMessage(bufName, msg) {
+		msg.key = messagesCount;
+		messagesCount++;
+
 		if (!msg.tags) {
 			msg.tags = {};
 		}
diff --git a/components/buffer.js b/components/buffer.js
index ffab128..05cafd9 100644
--- a/components/buffer.js
+++ b/components/buffer.js
@@ -98,7 +98,7 @@ export default function Buffer(props) {
 	return html`
 		<div class="logline-list">
 			${props.buffer.messages.map((msg) => html`
-				<${LogLine} message=${msg} onNickClick=${props.onNickClick}/>
+				<${LogLine} key=${msg.key} message=${msg} onNickClick=${props.onNickClick}/>
 			`)}
 		</div>
 	`;