diff --git a/packages/filepicker/src/Streaming/StreamingSaver.ts b/packages/filepicker/src/Streaming/StreamingSaver.ts
index d7cf2f2d4..7b5b0c9be 100644
--- a/packages/filepicker/src/Streaming/StreamingSaver.ts
+++ b/packages/filepicker/src/Streaming/StreamingSaver.ts
@@ -21,17 +21,30 @@ export class StreamingFileSaver {
     return window.showSaveFilePicker != undefined
   }
 
-  /** This function must be called in response to a user interaction, otherwise, it will be rejected by the browser. */
-  async selectFileToSaveTo(handle?: FileSystemFileHandle): Promise<void> {
+  /**
+   * This function must be called in response to a user interaction, otherwise, it will be rejected by the browser.
+   * @returns Whether file was successfully selected or not.
+   */
+  async selectFileToSaveTo(handle?: FileSystemFileHandle): Promise<boolean> {
     this.log('Showing save file picker')
 
-    const downloadHandle = handle
-      ? handle
-      : await window.showSaveFilePicker({
-          suggestedName: this.name,
-        })
+    try {
+      const downloadHandle = handle
+        ? handle
+        : await window.showSaveFilePicker({
+            suggestedName: this.name,
+          })
 
-    this.writableStream = await downloadHandle.createWritable()
+      if (!downloadHandle) {
+        return false
+      }
+
+      this.writableStream = await downloadHandle.createWritable()
+
+      return true
+    } catch {
+      return false
+    }
   }
 
   async pushBytes(bytes: Uint8Array): Promise<void> {
diff --git a/packages/web/src/javascripts/Controllers/FilesController.ts b/packages/web/src/javascripts/Controllers/FilesController.ts
index a9c3ad4eb..591ddf1f3 100644
--- a/packages/web/src/javascripts/Controllers/FilesController.ts
+++ b/packages/web/src/javascripts/Controllers/FilesController.ts
@@ -313,15 +313,18 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
     }
 
     try {
-      const saver = this.shouldUseStreamingAPI ? new StreamingFileSaver(file.name) : new ClassicFileSaver()
+      let saver = this.shouldUseStreamingAPI ? new StreamingFileSaver(file.name) : new ClassicFileSaver()
+      let didSelectFileToStreamTo = false
 
-      const isUsingStreamingSaver = saver instanceof StreamingFileSaver
-
-      if (isUsingStreamingSaver) {
+      if (isUsingStreamingSaver(saver)) {
         const fileHandle = directoryHandle
           ? await directoryHandle.getFileHandle(file.name, { create: true })
           : undefined
-        await saver.selectFileToSaveTo(fileHandle)
+        didSelectFileToStreamTo = await saver.selectFileToSaveTo(fileHandle)
+      }
+
+      if (isUsingStreamingSaver(saver) && !didSelectFileToStreamTo) {
+        saver = new ClassicFileSaver()
       }
 
       if (this.mobileDevice && canShowProgressNotification) {
@@ -345,7 +348,7 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
       let lastProgress: FileDownloadProgress | undefined
 
       const result = await this.files.downloadFile(file, async (decryptedBytes, progress) => {
-        if (isUsingStreamingSaver) {
+        if (isUsingStreamingSaver(saver)) {
           await saver.pushBytes(decryptedBytes)
         } else {
           decryptedBytesArray.push(decryptedBytes)
@@ -378,7 +381,7 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
         throw new Error(result.text)
       }
 
-      if (isUsingStreamingSaver) {
+      if (isUsingStreamingSaver(saver)) {
         await saver.finish()
       } else {
         const finalBytes = concatenateUint8Arrays(decryptedBytesArray)
@@ -850,3 +853,7 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
     })
   }
 }
+
+function isUsingStreamingSaver(saver: StreamingFileSaver | ClassicFileSaver): saver is StreamingFileSaver {
+  return saver instanceof StreamingFileSaver
+}