diff --git a/package.json b/package.json
index 90e77f9..69b9722 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "siteforge",
   "private": true,
-  "version": "2.0.37",
+  "version": "2.0.38",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/server/data.js b/server/data.js
index 49ab8aa..06b1ccc 100644
--- a/server/data.js
+++ b/server/data.js
@@ -967,17 +967,17 @@ export async function listUploadedAssets() {
     const { isR2Configured, listR2Objects } = await import('./r2.js')
     const { R2_PUBLIC_URL } = await import('./config.js')
     if (isR2Configured()) {
-      const ALL_FOLDERS = ['uploads', 'images', 'guides', 'finished']
-      const objects = (await Promise.all(ALL_FOLDERS.map(f => listR2Objects(`${f}/`)))).flat()
+      const objects = await listR2Objects('')
       r2Assets = objects
         .filter(obj => /\.(png|jpe?g|webp|gif|pdf|docx?)$/i.test(obj.Key))
         .map(obj => {
-          const filename = obj.Key.split('/').pop()
+          const parts = obj.Key.split('/')
+          const filename = parts.pop()
+          const folder = parts.length > 0 ? parts[0] : ''
           const entry = metadata[filename]
           const tags = Array.isArray(entry)
             ? entry.filter(t => typeof t === 'string')
             : Array.isArray(entry?.tags) ? entry.tags.filter(t => typeof t === 'string') : []
-          const folder = obj.Key.split('/')[0]
           return {
             filename,
             url: `${R2_PUBLIC_URL}/${obj.Key}`,