diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 9e8a2d684..c93ccac22 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -125,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 4f1fe6084..c4b7590af 100644
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
@@ -110,6 +110,7 @@ const makeMapStateToProps = () => {
       askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
       domain: state.getIn(['meta', 'domain']),
       me: state.get('me'),
+      displayMedia: getSettings(state).get('displayMedia'),
     };
   };
 
@@ -133,11 +134,12 @@ class Status extends ImmutablePureComponent {
     intl: PropTypes.object.isRequired,
     askReplyConfirmation: PropTypes.bool,
     domain: PropTypes.string,
+    displayMedia: PropTypes.string,
   };
 
   state = {
     fullscreen: false,
-    showMedia: defaultMediaVisibility(this.props.status),
+    showMedia: defaultMediaVisibility(this.props.status, this.props.displayMedia),
     loadedStatusId: undefined,
   };