diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 91459a1285c..7b26138e756 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -287,7 +287,9 @@ class MediaGallery extends PureComponent {
 
   isFullSizeEligible() {
     const { media } = this.props;
-    return media.size === 1 && media.getIn([0, 'meta', 'small', 'aspect']);
+    const aspect = media.getIn([0, 'meta', 'small', 'aspect']);
+    const minAspectRatioThreshold = 3/2;
+    return media.size === 1 && typeof aspect === 'number' && aspect >= minAspectRatioThreshold;
   }
 
   render () {