diff --git a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart
index f95992c5..7e3b46cf 100644
--- a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart
+++ b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart
@@ -1,3 +1,4 @@
+import 'dart:developer';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -49,14 +50,19 @@ extension MatrixFileExtension on MatrixFile {
   }
 
   Future<String> getDownloadPathAndroid() async {
+    final directory = await getDownloadDirectoryAndroid();
+    return '${directory.path}/$name';
+  }
+
+  Future<Directory> getDownloadDirectoryAndroid() async {
     final downloadDirectories = await getExternalStorageDirectories(
       type: StorageDirectory.downloads,
     );
     if (downloadDirectories != null && downloadDirectories.isNotEmpty) {
-      return downloadDirectories.first.path;
+      inspect(downloadDirectories);
+      return downloadDirectories.first;
     }
-    final fallbackDirectory = await getApplicationDocumentsDirectory();
-    return fallbackDirectory.path;
+    return await getApplicationDocumentsDirectory();
   }
 
   FileType get filePickerFileType {