diff --git a/client/components/LinkPreview.vue b/client/components/LinkPreview.vue
index bd3b0acd..965c5f75 100644
--- a/client/components/LinkPreview.vue
+++ b/client/components/LinkPreview.vue
@@ -146,11 +146,6 @@ export default {
 		this.link.shown = this.link.shown && shouldOpenByDefault;
 	},
 	mounted() {
-		// Don't display previews while they are loading on the server
-		if (this.link.type === "loading") {
-			return;
-		}
-
 		this.$root.$on("resize", this.handleResize);
 
 		this.onPreviewUpdate();
@@ -165,6 +160,11 @@ export default {
 	},
 	methods: {
 		onPreviewUpdate() {
+			// Don't display previews while they are loading on the server
+			if (this.link.type === "loading") {
+				return;
+			}
+
 			// Error don't have any media to render
 			if (this.link.type === "error") {
 				this.onPreviewReady();
diff --git a/client/components/LinkPreviewToggle.vue b/client/components/LinkPreviewToggle.vue
index 66a56b79..2d58d54f 100644
--- a/client/components/LinkPreviewToggle.vue
+++ b/client/components/LinkPreviewToggle.vue
@@ -1,5 +1,6 @@
 <template>
 	<button
+		v-if="link.type !== 'loading'"
 		:class="['toggle-button', 'toggle-preview', { opened: link.shown }]"
 		@click="onClick" />
 </template>