diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte
index 60f025bad..c4067ae04 100644
--- a/src/lib/components/filePicker.svelte
+++ b/src/lib/components/filePicker.svelte
@@ -54,8 +54,8 @@
     let view: 'grid' | 'list' = 'list';
 
     onMount(() => {
-        const filePickerPrefs = preferences.getFilePickerPreferences();
-        localFileBucketSelected = !filePickerPrefs.lastSelectedBucket;
+        const lastSelectedBucket = preferences.getKey('lastSelectedBucket', null);
+        localFileBucketSelected = !lastSelectedBucket;
 
         selectedBucket = currentBucket?.$id;
     });
@@ -66,9 +66,8 @@
             await uploadFile();
         }
 
-        preferences.setFilePickerPreferences({
-            lastSelectedBucket: localFileBucketSelected ? null : selectedBucket
-        });
+        // Save preference based on selection
+        preferences.setKey('lastSelectedBucket', localFileBucketSelected ? null : selectedBucket);
 
         onSelect(currentFile, localFileBucketSelected);
         closeModal();
@@ -90,9 +89,7 @@
             if (localFileBucketSelected) {
                 file = await sdk
                     .forConsoleIn(page.params.region)
-                    .storage.createFile('default', ID.unique(), localFile[0], [
-                        Permission.read(Role.any())
-                    ]);
+                    .storage.createFile('default', ID.unique(), localFile[0]);
             } else {
                 file = await sdk
                     .forProject(page.params.region, page.params.project)
@@ -163,13 +160,11 @@
             .forProject(page.params.region, page.params.project)
             .storage.listBuckets();
 
-        const filePickerPrefs = preferences.getFilePickerPreferences();
+        const lastSelectedBucket = preferences.getKey('lastSelectedBucket', null);
         let preferredBucket = null;
 
-        if (filePickerPrefs.lastSelectedBucket) {
-            preferredBucket = response.buckets.find(
-                (bucket) => bucket.$id === filePickerPrefs.lastSelectedBucket
-            );
+        if (lastSelectedBucket) {
+            preferredBucket = response.buckets.find((bucket) => bucket.$id === lastSelectedBucket);
         }
         const bucket = preferredBucket ?? response.buckets[0] ?? null;
 
diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index 4a09733ce..0cce4994a 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -314,28 +314,6 @@ function createPreferences() {
                 n.miscellaneous[key] = value;
                 return n;
             });
-        },
-        getFilePickerPreferences() {
-            return (
-                preferences?.filePicker ?? {
-                    lastSelectedBucket: null
-                }
-            );
-        },
-
-        async setFilePickerPreferences(prefs: ConsolePreferences['filePicker']) {
-            await updateAndSync((n) => {
-                if (!n?.filePicker) {
-                    n ??= {};
-                    n.filePicker ??= {};
-                }
-
-                n.filePicker = {
-                    ...n.filePicker,
-                    ...prefs
-                };
-                return n;
-            });
         }
     };
 }
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 95b99f4dd..f79333831 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -230,7 +230,7 @@
     <!-- CSVs can be text/plain or text/csv sometimes! -->
     <FilePicker
         {onSelect}
-        showLocalFileBucket={true}
+        showLocalFileBucket
         localFileBucketTitle="Upload CSV file"
         mimeTypeQuery="text/"
         allowedExtension="csv"