diff --git a/lib/src/event.dart b/lib/src/event.dart
index d45176fd..b19cafbb 100644
--- a/lib/src/event.dart
+++ b/lib/src/event.dart
@@ -792,9 +792,11 @@ class Event extends MatrixEvent {
         throw ('Unable to decrypt file');
       }
     }
+
+    final filename = content.tryGet<String>('filename') ?? body;
     return MatrixFile(
       bytes: uint8list,
-      name: body,
+      name: filename,
       mimeType: attachmentMimetype,
     );
   }