diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 5f9e5e7db1..df72398b1c 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -172,6 +172,8 @@ export default createReactClass({
                     const hidden = global.localStorage.getItem("hide_preview_" + this.props.mxEvent.getId());
                     this.setState({ widgetHidden: hidden });
                 }
+            } else if (this.state.links.length) {
+                this.setState({ links: [] });
             }
         }
     },
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 1fe70dc61c..d1c1ce04f9 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -134,7 +134,7 @@ export default createReactClass({
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
-            <div className="mx_LinkPreviewWidget" >
+            <div className="mx_LinkPreviewWidget">
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
                     <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a></div>