diff --git a/web/src/ui/timeline/content/MediaMessageBody.tsx b/web/src/ui/timeline/content/MediaMessageBody.tsx
index 235ddce..01fc95f 100644
--- a/web/src/ui/timeline/content/MediaMessageBody.tsx
+++ b/web/src/ui/timeline/content/MediaMessageBody.tsx
@@ -62,9 +62,7 @@ const MediaMessageBody = ({ event, room, sender }: EventContentProps) => {
 	const renderPlaceholderElem = supportsClickToShow && (!renderMediaElem || !!contentWarning || !loaded)
 	const isLoadingOnlyCover = !loaded && !contentWarning && renderMediaElem
 
-	const [mediaContent, containerClass, containerStyle] = useMediaContent(
-		content, event.type, undefined, onLoad, !clickedShow,
-	)
+	const [mediaContent, containerClass, containerStyle] = useMediaContent(content, event.type, undefined, onLoad)
 
 	let placeholderElem: JSX.Element | null = null
 	if (renderPlaceholderElem) {
diff --git a/web/src/ui/timeline/content/index.css b/web/src/ui/timeline/content/index.css
index 5ec0b7b..a2fd886 100644
--- a/web/src/ui/timeline/content/index.css
+++ b/web/src/ui/timeline/content/index.css
@@ -199,10 +199,6 @@ div.html-body {
 }
 
 div.media-container {
-	&.image-container, &.video-container {
-		contain: strict;
-	}
-
 	> div.placeholder {
 		position: relative;
 		width: 100%;
diff --git a/web/src/ui/timeline/content/useMediaContent.tsx b/web/src/ui/timeline/content/useMediaContent.tsx
index a98f426..0754df6 100644
--- a/web/src/ui/timeline/content/useMediaContent.tsx
+++ b/web/src/ui/timeline/content/useMediaContent.tsx
@@ -25,7 +25,6 @@ export const useMediaContent = (
 	evtType: EventType,
 	containerSize?: ImageContainerSize,
 	onLoad?: () => void,
-	lazyLoad = true,
 ): [JSX.Element | null, string, CSSProperties] => {
 	const mediaURL = content.file?.url ? getEncryptedMediaURL(content.file.url) : getMediaURL(content.url)
 	const thumbnailURL = content.info?.thumbnail_file?.url
@@ -34,7 +33,6 @@ export const useMediaContent = (
 		const style = calculateMediaSize(content.info?.w, content.info?.h, containerSize)
 		return [<img
 			onLoad={onLoad}
-			loading={lazyLoad ? "lazy" : "eager"}
 			style={style.media}
 			src={mediaURL}
 			alt={content.filename ?? content.body}
diff --git a/web/src/util/mediasize.ts b/web/src/util/mediasize.ts
index e34afd9..a59bb7a 100644
--- a/web/src/util/mediasize.ts
+++ b/web/src/util/mediasize.ts
@@ -39,6 +39,10 @@ export function calculateMediaSize(
 			container: {
 				width: `${imageContainerWidth}px`,
 				height: `${imageContainerHeight}px`,
+				containIntrinsicWidth: `${imageContainerWidth}px`,
+				containIntrinsicHeight: `${imageContainerHeight}px`,
+				contentVisibility: "auto",
+				contain: "strict",
 			},
 			media: {},
 		}
@@ -64,6 +68,10 @@ export function calculateMediaSize(
 		container: {
 			width: `${width}px`,
 			height: `${height}px`,
+			containIntrinsicWidth: `${width}px`,
+			containIntrinsicHeight: `${height}px`,
+			contentVisibility: "auto",
+			contain: "strict",
 		},
 		media: {
 			aspectRatio: `${origWidth} / ${origHeight}`,