diff --git a/lib/utils/file_selector.dart b/lib/utils/file_selector.dart
index fd35891af..2e09b492f 100644
--- a/lib/utils/file_selector.dart
+++ b/lib/utils/file_selector.dart
@@ -3,7 +3,6 @@ import 'package:flutter/widgets.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:file_selector/file_selector.dart';
 
-import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/app_lock.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 
@@ -13,31 +12,18 @@ Future<List<XFile>> selectFiles(
   FileSelectorType type = FileSelectorType.any,
   bool allowMultiple = false,
 }) async {
-  if (!PlatformInfos.isLinux) {
-    final result = await AppLock.of(context).pauseWhile(
-      showFutureLoadingDialog(
-        context: context,
-        future: () => FilePicker.platform.pickFiles(
-          compressionQuality: 0,
-          allowMultiple: allowMultiple,
-          type: type.filePickerType,
-          allowedExtensions: type.extensions,
-        ),
+  final result = await AppLock.of(context).pauseWhile(
+    showFutureLoadingDialog(
+      context: context,
+      future: () => FilePicker.platform.pickFiles(
+        compressionQuality: 0,
+        allowMultiple: allowMultiple,
+        type: type.filePickerType,
+        allowedExtensions: type.extensions,
       ),
-    );
-    return result.result?.xFiles ?? [];
-  }
-
-  if (allowMultiple) {
-    return await AppLock.of(context).pauseWhile(
-      openFiles(confirmButtonText: title, acceptedTypeGroups: type.groups),
-    );
-  }
-  final file = await AppLock.of(context).pauseWhile(
-    openFile(confirmButtonText: title, acceptedTypeGroups: type.groups),
+    ),
   );
-  if (file == null) return [];
-  return [file];
+  return result.result?.xFiles ?? [];
 }
 
 enum FileSelectorType {
diff --git a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart
index 069b6ec8b..f84f21996 100644
--- a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart
+++ b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart
@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 
 import 'package:file_picker/file_picker.dart';
-import 'package:file_selector/file_selector.dart';
 import 'package:matrix/matrix.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:universal_html/html.dart' as html;
@@ -20,18 +19,12 @@ extension MatrixFileExtension on MatrixFile {
       return;
     }
 
-    final downloadPath = !PlatformInfos.isMobile
-        ? (await getSaveLocation(
-            suggestedName: name,
-            confirmButtonText: L10n.of(context).saveFile,
-          ))
-            ?.path
-        : await FilePicker.platform.saveFile(
-            dialogTitle: L10n.of(context).saveFile,
-            fileName: name,
-            type: filePickerFileType,
-            bytes: bytes,
-          );
+    final downloadPath = await FilePicker.platform.saveFile(
+      dialogTitle: L10n.of(context).saveFile,
+      fileName: name,
+      type: filePickerFileType,
+      bytes: bytes,
+    );
     if (downloadPath == null) return;
 
     if (PlatformInfos.isDesktop) {
diff --git a/pubspec.yaml b/pubspec.yaml
index e0b5389ab..e2307c1d4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -144,4 +144,4 @@ dependency_overrides:
     git:
       url: https://github.com/ThexXTURBOXx/flutter_web_auth_2.git
       ref: 3.x-without-v1
-      path: flutter_web_auth_2
\ No newline at end of file
+      path: flutter_web_auth_2