diff --git a/CHANGES.md b/CHANGES.md
index c813a87db1..d8556e16bc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Bugfix 🐛:
  - Clear the notification when the event is read elsewhere (#1822)
  - Speakerphone is not used for ringback tone (#1644, #1645)
  - Back camera preview is not mirrored anymore (#1776)
+ - Various report of people that cannot play video (#2107)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index aa4114c8c2..a163cd4809 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -144,11 +144,13 @@ internal class DefaultFileService @Inject constructor(
 
                         if (elementToDecrypt != null) {
                             Timber.v("## FileService: decrypt file")
-                            val decryptSuccess = MXEncryptedAttachments.decryptAttachment(
-                                    source.inputStream(),
-                                    elementToDecrypt,
-                                    destFile.outputStream().buffered()
-                            )
+                            val decryptSuccess = destFile.outputStream().buffered().use {
+                                MXEncryptedAttachments.decryptAttachment(
+                                        source.inputStream(),
+                                        elementToDecrypt,
+                                        it
+                                )
+                            }
                             response.close()
                             if (!decryptSuccess) {
                                 return@flatMap Try.Failure(IllegalStateException("Decryption error"))