diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 8d4faca8..7539bb1c 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -5,6 +5,7 @@
 🐞 Fixed
 
 - [[#491]](https://github.com/GetStream/stream-chat-flutter/issues/491): Fix `MediaListView` showing media in wrong order.
+- Fix image thumbnail generation when using Stream CDN
 
 ✅ Added
 
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 95229418..16b5f4b7 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
@@ -72,7 +72,7 @@ class ImageAttachment extends AttachmentWidget {
           }
 
           var imageUri = Uri.parse(imageUrl);
-          if (imageUri.host == 'stream-io-cdn.com') {
+          if (imageUri.host.endsWith('stream-io-cdn.com')) {
             imageUri = imageUri.replace(queryParameters: {
               ...imageUri.queryParameters,
               'h': '400',
@@ -80,7 +80,7 @@ class ImageAttachment extends AttachmentWidget {
               'crop': 'center',
               'resize': 'crop',
             });
-          } else if (imageUri.host == 'stream-cloud-uploads.imgix.net') {
+          } else if (imageUri.host.endsWith('stream-cloud-uploads.imgix.net')) {
             imageUri = imageUri.replace(queryParameters: {
               ...imageUri.queryParameters,
               'height': '400',