diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 0c0f6be42..c93ccac22 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -112,7 +112,6 @@ class Status extends ImmutablePureComponent {
   // Track height changes we know about to compensate scrolling
   componentDidMount() {
     this.didShowCard = !this.props.muted && !this.props.hidden && this.props.status && this.props.status.get('card');
-    this.setState({ showMedia: defaultMediaVisibility(this.props.status, this.props.displayMedia) });
   }
 
   getSnapshotBeforeUpdate() {
@@ -126,7 +125,7 @@ class Status extends ImmutablePureComponent {
   static getDerivedStateFromProps(nextProps, prevState) {
     if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
       return {
-        showMedia: defaultMediaVisibility(nextProps.status),
+        showMedia: defaultMediaVisibility(nextProps.status, nextProps.displayMedia),
         statusId: nextProps.status.get('id'),
       };
     } else {
diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js
index 9febc716a..c4b7590af 100644
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
@@ -146,7 +146,6 @@ class Status extends ImmutablePureComponent {
   componentDidMount() {
     this.props.dispatch(fetchStatus(this.props.params.statusId));
     attachFullscreenListener(this.onFullScreenChange);
-    this.setState({ showMedia: defaultMediaVisibility(this.props.status, this.props.displayMedia) });
   }
 
   handleToggleMediaVisibility = () => {