diff --git a/src/app/api/upload/route.ts b/src/app/api/upload/route.ts
index ff99ea5..5075dc7 100644
--- a/src/app/api/upload/route.ts
+++ b/src/app/api/upload/route.ts
@@ -34,9 +34,17 @@ export async function GET(req: NextRequest) {
     const childId = searchParams.get("childId") || "default";
     const prefix = `memories/${childId}`;
 
-    const command = new ListObjectsV2Command({ Bucket: bucket, Prefix: prefix });
+    const command = new ListObjectsV2Command({ Bucket: bucket, Prefix: prefix, MaxKeys: 10 });
     const res = await client.send(command);
-    const objects = (res.Contents || []).map((obj) => ({
+
+    // Debug: log what we found
+    console.log("List result:", JSON.stringify(res));
+
+    if (!res.Contents || res.Contents.length === 0) {
+      return NextResponse.json({ memories: [], debug: { bucket, prefix, count: 0 } });
+    }
+
+    const objects = res.Contents.map((obj) => ({
       key: obj.Key,
       url: `${baseUrl}/${obj.Key}`,
       size: obj.Size,
@@ -46,7 +54,7 @@ export async function GET(req: NextRequest) {
     return NextResponse.json({ memories: objects });
   } catch (error) {
     console.error("R2 list error:", error);
-    return NextResponse.json({ error: String(error) }, { status: 500 });
+    return NextResponse.json({ error: String(error), stack: error?.stack }, { status: 500 });
   }
 }