diff --git a/assets/images/media-offline.jpg b/assets/images/media-offline.jpg
new file mode 100644
index 00000000..5eb398dd
Binary files /dev/null and b/assets/images/media-offline.jpg differ
diff --git a/assets/images/media-offline.png b/assets/images/media-offline.png
deleted file mode 100644
index 8633f8a1..00000000
Binary files a/assets/images/media-offline.png and /dev/null differ
diff --git a/lib/screens/chat/room.dart b/lib/screens/chat/room.dart
index 54938d2c..8ce1fedb 100644
--- a/lib/screens/chat/room.dart
+++ b/lib/screens/chat/room.dart
@@ -1261,7 +1261,7 @@ class ChatRoomScreen extends HookConsumerWidget {
       attachments.value = [
         ...attachments.value,
         ...result.files.map(
-          (e) => UniversalFile(data: e, type: UniversalFileType.image),
+          (e) => UniversalFile(data: e.xFile, type: UniversalFileType.image),
         ),
       ];
     }
@@ -1276,7 +1276,7 @@ class ChatRoomScreen extends HookConsumerWidget {
       attachments.value = [
         ...attachments.value,
         ...result.files.map(
-          (e) => UniversalFile(data: e, type: UniversalFileType.video),
+          (e) => UniversalFile(data: e.xFile, type: UniversalFileType.video),
         ),
       ];
     }
diff --git a/lib/widgets/content/image.dart b/lib/widgets/content/image.dart
index 491f54d3..bf17fb39 100644
--- a/lib/widgets/content/image.dart
+++ b/lib/widgets/content/image.dart
@@ -52,12 +52,10 @@ class UniversalImage extends StatelessWidget {
             },
             errorWidget: (context, url, error) {
               return Image.asset(
-                'assets/images/media-offline.png',
+                'assets/images/media-offline.jpg',
                 fit: BoxFit.cover,
+                key: Key('image-broke-$uri'),
               );
-              // return const Center(
-              //   child: Icon(Icons.broken_image, color: Colors.white, size: 16),
-              // );
             },
           ),
         ],
diff --git a/lib/widgets/post/compose_shared.dart b/lib/widgets/post/compose_shared.dart
index 6f241d82..8e5253c2 100644
--- a/lib/widgets/post/compose_shared.dart
+++ b/lib/widgets/post/compose_shared.dart
@@ -398,7 +398,7 @@ class ComposeLogic {
     state.attachments.value = [
       ...state.attachments.value,
       ...result.files.map(
-        (e) => UniversalFile(data: e, type: UniversalFileType.image),
+        (e) => UniversalFile(data: e.xFile, type: UniversalFileType.image),
       ),
     ];
   }
@@ -413,7 +413,7 @@ class ComposeLogic {
     state.attachments.value = [
       ...state.attachments.value,
       ...result.files.map(
-        (e) => UniversalFile(data: e, type: UniversalFileType.video),
+        (e) => UniversalFile(data: e.xFile, type: UniversalFileType.video),
       ),
     ];
   }