diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 58f1507..62efbc7 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -31,6 +31,7 @@ function Avatar(props: Props) {
 				src={props.user?.avatarUrl ?? app.account?.avatarUrl}
 				width={props.size ?? 32}
 				height={props.size ?? 32}
+				loading="eager"
 			/>
 		</Wrapper>
 	);
diff --git a/src/components/GuildItem.tsx b/src/components/GuildItem.tsx
index e100f65..aae74c1 100644
--- a/src/components/GuildItem.tsx
+++ b/src/components/GuildItem.tsx
@@ -123,6 +123,7 @@ function GuildItem({ guild, active }: Props) {
 							src={REST.makeCDNUrl(CDNRoutes.guildIcon(guild.id, guild?.icon, ImageFormat.PNG))}
 							width={48}
 							height={48}
+							loading="lazy"
 						/>
 					) : (
 						<span
diff --git a/src/components/SidebarAction.tsx b/src/components/SidebarAction.tsx
index dc854b6..a1402db 100644
--- a/src/components/SidebarAction.tsx
+++ b/src/components/SidebarAction.tsx
@@ -69,7 +69,7 @@ function SidebarAction(props: Props) {
 					active={props.active}
 					useGreenColorScheme={props.useGreenColorScheme}
 				>
-					{props.image && <img {...props.image} />}
+					{props.image && <img {...props.image} loading="lazy" />}
 					{props.icon && (
 						<Icon
 							{...props.icon}
diff --git a/src/components/messaging/MessageAttachment.tsx b/src/components/messaging/MessageAttachment.tsx
index e01de38..aa661ab 100644
--- a/src/components/messaging/MessageAttachment.tsx
+++ b/src/components/messaging/MessageAttachment.tsx
@@ -47,7 +47,9 @@ export default function MessageAttachment({ attachment, contextMenuItems, maxWid
 			maxWidth,
 			maxHeight,
 		);
-		finalElement = <Image src={url} alt={attachment.filename} width={scaledWidth} height={scaledHeight} />;
+		finalElement = (
+			<Image src={url} alt={attachment.filename} width={scaledWidth} height={scaledHeight} loading="lazy" />
+		);
 	} else if (details.isVideo && details.isEmbeddable) {
 		finalElement = <Video attachment={attachment} />;
 	} else if (details.isAudio && details.isEmbeddable) {
diff --git a/src/components/modals/AttachmentPreviewModal.tsx b/src/components/modals/AttachmentPreviewModal.tsx
index a19b192..a3d8a3f 100644
--- a/src/components/modals/AttachmentPreviewModal.tsx
+++ b/src/components/modals/AttachmentPreviewModal.tsx
@@ -1,10 +1,7 @@
 import { APIAttachment } from "@spacebarchat/spacebar-api-types/v9";
-import { calculateImageRatio, calculateScaledDimensions } from "../../utils/Message";
 import { Modal } from "./ModalComponents";
 import { AnimatedModalProps } from "./ModalRenderer";
 
-const SCALE_FACTOR = 3.5;
-
 interface Props extends AnimatedModalProps {
 	attachment: APIAttachment;
 }
@@ -12,11 +9,6 @@ interface Props extends AnimatedModalProps {
 function AttachmentPreviewModal(props: Props) {
 	const width = props.attachment.width ?? 0;
 	const height = props.attachment.height ?? 0;
-	const maxWidth = 400 * SCALE_FACTOR;
-	const maxHeight = 300 * SCALE_FACTOR;
-
-	const ratio = calculateImageRatio(width, height, maxWidth, maxHeight);
-	const { scaledWidth, scaledHeight } = calculateScaledDimensions(width, height, ratio, maxWidth, maxHeight);
 
 	return (
 		<Modal
@@ -28,7 +20,14 @@ function AttachmentPreviewModal(props: Props) {
 			}}
 			{...props}
 		>
-			<img src={props.attachment.url} width={scaledWidth} height={scaledHeight} />
+			<div
+				style={{
+					maxWidth: "100vw",
+					maxHeight: "100vh",
+				}}
+			>
+				<img src={props.attachment.url} width={width} height={height} loading="eager" />
+			</div>
 		</Modal>
 	);
 }