diff --git a/src/components/media.jsx b/src/components/media.jsx
index ffd3f3ca..9f0361cd 100644
--- a/src/components/media.jsx
+++ b/src/components/media.jsx
@@ -116,9 +116,12 @@ function Media({ media, to, showOriginal, autoAnimate, onClick = () => {} }) {
     if (smaller) setImageSmallerThanParent(smaller);
   }, [width, height]);
 
+  const maxAspectHeight = window.innerHeight * 0.33;
   const mediaStyles = {
     '--width': `${width}px`,
     '--height': `${height}px`,
+    // Calculate '--aspectWidth' based on aspect ratio calculated from '--width' and '--height', max height has to be 160px
+    '--aspectWidth': `${(width / height) * Math.max(160, maxAspectHeight)}px`,
     aspectRatio: `${width} / ${height}`,
   };
 
diff --git a/src/components/status.css b/src/components/status.css
index bbbe8949..7bf96dd2 100644
--- a/src/components/status.css
+++ b/src/components/status.css
@@ -599,7 +599,8 @@
   min-width: 44px;
   /* width: auto; */
   min-height: 44px;
-  --aspectWidth: calc(--width / --height * max(160px, 33vh));
+  /* --maxAspectHeight: max(160px, 33vh);
+  --aspectWidth: calc(--width / --height * var(--maxAspectHeight)); */
   width: min(var(--aspectWidth), var(--width), 100%);
   max-height: min(var(--height), 33vh);
 }