diff --git a/client/components/LinkPreviewToggle.vue b/client/components/LinkPreviewToggle.vue
index 1354b0f7..ed5d2a14 100644
--- a/client/components/LinkPreviewToggle.vue
+++ b/client/components/LinkPreviewToggle.vue
@@ -15,7 +15,7 @@ export default {
 		onClick: function() {
 			this.link.shown = !this.link.shown;
 
-			this.$parent.$emit("linkPreviewToggle");
+			this.$parent.$emit("linkPreviewToggle", this.link, this.$parent.message);
 		}
 	}
 };
diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index eaaae2c4..56d43516 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -35,6 +35,7 @@
 			<Message
 				v-else
 				:message="message"
+				@linkPreviewToggle="onLinkPreviewToggle"
 				:key="message.id"/>
 		</template>
 	</div>
@@ -43,6 +44,7 @@
 <script>
 const constants = require("../js/constants");
 const clipboard = require("../js/clipboard");
+import socket from "../js/socket";
 import Message from "./Message.vue";
 import MessageCondensed from "./MessageCondensed.vue";
 
@@ -114,6 +116,17 @@ export default {
 		onCopy() {
 			clipboard(this.$el);
 		},
+		onLinkPreviewToggle(preview, message) {
+			// Tell the server we're toggling so it remembers at page reload
+			// TODO Avoid sending many single events when using `/collapse` or `/expand`
+			// See https://github.com/thelounge/thelounge/issues/1377
+			socket.emit("msg:preview:toggle", {
+				target: this.channel.id,
+				msgId: message.id,
+				link: preview.link,
+				shown: preview.shown,
+			});
+		},
 	},
 };
 </script>
diff --git a/client/js/libs/handlebars/parse.js b/client/js/libs/handlebars/parse.js
index d67783a7..8e9cdf2e 100644
--- a/client/js/libs/handlebars/parse.js
+++ b/client/js/libs/handlebars/parse.js
@@ -156,11 +156,6 @@ module.exports = function parse(text, message = null, createElement = null) {
 					props: {
 						link: preview,
 					},
-					on: {
-						linkPreviewToggle() {
-							console.log('it got toggled!!!')
-						}
-					}
 				}, fragments)];
 				
 				//`<button class="toggle-button toggle-preview" data-url="${escapedLink}" hidden></button>`;