diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
index 31807269b7..283d726636 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
@@ -125,6 +125,7 @@ class AndroidMediaPreProcessor @Inject constructor(
             val compressionResult = imageCompressor.compressToTmpFile(
                 inputStreamProvider = { contentResolver.openInputStream(uri)!! },
                 resizeMode = ResizeMode.Approximate(IMAGE_SCALE_REF_SIZE, IMAGE_SCALE_REF_SIZE),
+                mimeType = mimeType,
                 orientation = orientation,
             ).getOrThrow()
             val thumbnailResult = thumbnailFactory.createImageThumbnail(compressionResult.file)
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt
index 69d2e41baa..71078b69e0 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.androidutils.bitmap.resizeToMax
 import io.element.android.libraries.androidutils.bitmap.rotateToMetadataOrientation
 import io.element.android.libraries.androidutils.file.createTmpFile
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.di.ApplicationContext
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -34,14 +35,23 @@ class ImageCompressor @Inject constructor(
     suspend fun compressToTmpFile(
         inputStreamProvider: () -> InputStream,
         resizeMode: ResizeMode,
-        format: Bitmap.CompressFormat = Bitmap.CompressFormat.JPEG,
+        mimeType: String,
         orientation: Int = ExifInterface.ORIENTATION_UNDEFINED,
         desiredQuality: Int = 78,
     ): Result<ImageCompressionResult> = withContext(dispatchers.io) {
         runCatching {
+            val format = when (mimeType) {
+                MimeTypes.Png -> Bitmap.CompressFormat.PNG
+                else -> Bitmap.CompressFormat.JPEG
+            }
+            val extension = when (mimeType) {
+                MimeTypes.Png -> "png"
+                else -> "jpeg"
+            }
+
             val compressedBitmap = compressToBitmap(inputStreamProvider, resizeMode, orientation).getOrThrow()
             // Encode bitmap to the destination temporary file
-            val tmpFile = context.createTmpFile(extension = "jpeg")
+            val tmpFile = context.createTmpFile(extension = extension)
             tmpFile.outputStream().use {
                 compressedBitmap.compress(format, desiredQuality, it)
             }