diff --git a/keybindings.js b/keybindings.js
index 0c99ae5..655bf42 100644
--- a/keybindings.js
+++ b/keybindings.js
@@ -23,9 +23,18 @@ export const keybindings = [
 						let lastMsg = buf.messages[buf.messages.length - 1];
 						app.setReceipt(buf.name, ReceiptType.READ, lastMsg);
 					}
+
 					buffers.set(buf.id, {
 						...buf,
 						unread: Unread.NONE,
+						prevReadReceipt: null,
+					});
+
+					let client = app.clients.get(buf.server);
+					app.bufferStore.put({
+						name: buf.name,
+						server: client.params,
+						unread: Unread.NONE,
 					});
 				});
 				return { buffers };