1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/glitch/components/status/index.js b/app/javascript/glitch/components/status/index.js
index a11cc0b6e..12ea0e9aa 100644
--- a/app/javascript/glitch/components/status/index.js
+++ b/app/javascript/glitch/components/status/index.js
@@ -233,7 +233,9 @@ uncollapse our status accordingly.
 
   componentWillReceiveProps (nextProps) {
     if (!nextProps.settings.getIn(['collapsed', 'enabled'])) {
-      this.setExpansion(true);
+      if (this.state.isExpanded === false) {
+        this.setExpansion(null);
+      }
     } else if (
       nextProps.collapse !== this.props.collapse &&
       nextProps.collapse !== undefined