diff --git a/.changeset/fix-pixelated-scaling.md b/.changeset/fix-pixelated-scaling.md
new file mode 100644
index 000000000..77a7e2b9e
--- /dev/null
+++ b/.changeset/fix-pixelated-scaling.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix pixelated image scaling not pixelating when zoomed in.
diff --git a/src/app/components/image-viewer/ImageViewer.css.ts b/src/app/components/image-viewer/ImageViewer.css.ts
index 058c6ce68..220afaaeb 100644
--- a/src/app/components/image-viewer/ImageViewer.css.ts
+++ b/src/app/components/image-viewer/ImageViewer.css.ts
@@ -58,4 +58,5 @@ export const ImageViewerImg = style([
 
 export const ImageViewerImgPixelated = style({
   imageRendering: 'pixelated',
+  willChange: 'auto',
 });
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 43768ca41..f6c17af88 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -718,7 +718,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
         let content = await uploadToContent(upload);
         handleCancelUpload(uploads);
 
-        content.body = caption;
+        content.body = caption ?? '';
         content.formatted_body = undefined;
 
         if (formattedCaption) {