diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart
index 4c6a4ccf..44a4c2ac 100644
--- a/lib/pages/chat/events/audio_player.dart
+++ b/lib/pages/chat/events/audio_player.dart
@@ -66,8 +66,7 @@ class _AudioPlayerState extends State<AudioPlayerWidget> {
           await widget.event.downloadAndDecryptAttachmentCached();
       if (matrixFile == null) throw ('Download failed');
       final tempDir = await getTemporaryDirectory();
-      final fileName =
-          widget.event.content.tryGet<String>('filename') ?? matrixFile.name;
+      final fileName = widget.event.infoMap['url'] as String;
       final file = File('${tempDir.path}/$fileName');
       await file.writeAsBytes(matrixFile.bytes);
 
diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart
index a41a6a65..74a96d6e 100644
--- a/lib/pages/chat/events/video_player.dart
+++ b/lib/pages/chat/events/video_player.dart
@@ -40,8 +40,9 @@ class _EventVideoPlayerState extends State<EventVideoPlayer> {
         final blob = html.Blob([videoFile.bytes]);
         _networkUri = html.Url.createObjectUrlFromBlob(blob);
       } else {
-        final tmpDir = await getTemporaryDirectory();
-        final file = File(tmpDir.path + videoFile.name);
+        final tempDir = await getTemporaryDirectory();
+        final fileName = widget.event.infoMap['url'] as String;
+        final file = File('${tempDir.path}/$fileName');
         if (await file.exists() == false) {
           await file.writeAsBytes(videoFile.bytes);
         }