diff --git a/app/soapbox/components/status_content.js b/app/soapbox/components/status_content.js
index aae081fc2..d1b829d18 100644
--- a/app/soapbox/components/status_content.js
+++ b/app/soapbox/components/status_content.js
@@ -66,15 +66,16 @@ export default class StatusContent extends React.PureComponent {
     if (!node) {
       return;
     }
-    
+
     if (
       this.props.collapsable
       && this.props.onClick
       && this.state.collapsed === null
-      && node.clientHeight > MAX_HEIGHT
       && this.props.status.get('spoiler_text').length === 0
     ) {
-      this.setState({ collapsed: true });
+      if (node.clientHeight > MAX_HEIGHT){
+        this.setState({ collapsed: true });
+      }
     }
   }