diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index 78ce4c30..3b1fb836 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -115,8 +115,10 @@ export default {
 		},
 	},
 	watch: {
-		"channel.messages"() {
+		"channel.id"() {
 			this.scrolledToBottom = true;
+		},
+		"channel.messages"() {
 			this.keepScrollPosition();
 		},
 	},