diff --git a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
index 3d0c3314..be1b33bb 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
@@ -100,6 +100,7 @@ class StreamFileAttachment extends StreamAttachmentWidget {
         borderRadius: BorderRadius.circular(8),
       );
 
+  // TODO: Improve image memory. This is using the full image instead of a smaller version (thumbnail)
   Widget _getFileTypeImage(BuildContext context) {
     if (isImageAttachment) {
       return Material(
diff --git a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
index c022ee48..a5537140 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
@@ -71,16 +71,20 @@ class StreamImageAttachment extends StreamAttachmentWidget {
 
           var imageUri = Uri.parse(imageUrl);
           if (imageUri.host.endsWith('stream-io-cdn.com') &&
-              imageUri.queryParameters['h'] == '*' &&
-              imageUri.queryParameters['w'] == '*' &&
-              imageUri.queryParameters['crop'] == '*' &&
-              imageUri.queryParameters['resize'] == '*') {
+              (imageUri.queryParameters['h'] == null ||
+                  imageUri.queryParameters['h'] == '*') &&
+              (imageUri.queryParameters['w'] == null ||
+                  imageUri.queryParameters['w'] == '*') &&
+              (imageUri.queryParameters['crop'] == null ||
+                  imageUri.queryParameters['crop'] == '*') &&
+              (imageUri.queryParameters['resize'] == null ||
+                  imageUri.queryParameters['resize'] == '*')) {
             imageUri = imageUri.replace(queryParameters: {
               ...imageUri.queryParameters,
-              'h': '400',
+              'h': '400', // TODO: Are these sizes optimal? Consider web/desktop
               'w': '400',
               'crop': 'center',
-              'resize': 'crop',
+              'resize': 'clip',
             });
           } else if (imageUri.host.endsWith('stream-cloud-uploads.imgix.net')) {
             imageUri = imageUri.replace(queryParameters: {
diff --git a/packages/stream_chat_flutter/lib/src/v4/message_input/stream_attachment_picker.dart b/packages/stream_chat_flutter/lib/src/v4/message_input/stream_attachment_picker.dart
index 2473cf0a..f4de13b6 100644
--- a/packages/stream_chat_flutter/lib/src/v4/message_input/stream_attachment_picker.dart
+++ b/packages/stream_chat_flutter/lib/src/v4/message_input/stream_attachment_picker.dart
@@ -1,4 +1,6 @@
 import 'dart:async';
+import 'dart:io';
+import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -371,13 +373,31 @@ class _StreamAttachmentPickerState extends State<StreamAttachmentPicker> {
 
   void _addAssetAttachment(AssetEntity medium) async {
     final mediaFile = await medium.originFile;
-
     if (mediaFile == null) return;
-
     final tempDir = await getTemporaryDirectory();
 
-    final cachedFile = await mediaFile
-        .copy('${tempDir.path}/${mediaFile.path.split('/').last}');
+    // TODO: Confirm that this max resolution is final
+    const maxCDNImageResolution = 16800000;
+    final imageResolution = medium.width * medium.height;
+    File? cachedFile;
+    if (imageResolution > maxCDNImageResolution) {
+      final aspect = imageResolution / maxCDNImageResolution;
+      final updatedSize = medium.size / (math.sqrt(aspect));
+      final resizedImage = await medium.thumbnailDataWithSize(
+        ThumbnailSize(
+          updatedSize.width.floor(),
+          updatedSize.height.floor(),
+        ),
+        quality: 30, // TODO: investigate compressing all images
+      );
+      cachedFile =
+          await File('${tempDir.path}/${mediaFile.path.split('/').last}')
+              .create()
+            ..writeAsBytesSync(resizedImage!);
+    } else {
+      cachedFile = await mediaFile
+          .copy('${tempDir.path}/${mediaFile.path.split('/').last}');
+    }
 
     final file = AttachmentFile(
       path: cachedFile.path,