diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index f899c7c64bb..e19f194b8ce 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -238,7 +238,7 @@ uncollapse our status accordingly.
 
   componentWillReceiveProps (nextProps) {
     if (!nextProps.settings.getIn(['collapsed', 'enabled'])) {
-      this.setExpansion(false);
+      this.setExpansion(true);
     } else if (
       nextProps.collapse !== this.props.collapse &&
       nextProps.collapse !== undefined