diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.vue b/src/components/sidebar/tabs/AssetsSidebarTab.vue
index a0ce53c0f..244b3e0a6 100644
--- a/src/components/sidebar/tabs/AssetsSidebarTab.vue
+++ b/src/components/sidebar/tabs/AssetsSidebarTab.vue
@@ -597,9 +597,14 @@ const enterFolderView = async (asset: AssetItem) => {
   folderPromptId.value = promptId
   folderExecutionTime.value = executionTimeInSeconds
 
-  const folderItems = await resolveOutputAssetItems(metadata, {
-    createdAt: asset.created_at
-  })
+  let folderItems: AssetItem[] = []
+  try {
+    folderItems = await resolveOutputAssetItems(metadata, {
+      createdAt: asset.created_at
+    })
+  } catch (error) {
+    console.error('Failed to resolve outputs for folder view:', error)
+  }
 
   if (folderItems.length === 0) {
     console.warn('No outputs available for folder view')
diff --git a/src/platform/assets/composables/useOutputStacks.test.ts b/src/platform/assets/composables/useOutputStacks.test.ts
index d770b3c75..c00b294b2 100644
--- a/src/platform/assets/composables/useOutputStacks.test.ts
+++ b/src/platform/assets/composables/useOutputStacks.test.ts
@@ -72,7 +72,7 @@ describe('useOutputStacks', () => {
       expect.objectContaining({ promptId: 'prompt-1' }),
       {
         createdAt: parent.created_at,
-        excludeOutputKey: parent.name
+        excludeOutputKey: 'node-1-outputs-parent.png'
       }
     )
     expect(isStackExpanded(parent)).toBe(true)
diff --git a/src/platform/assets/composables/useOutputStacks.ts b/src/platform/assets/composables/useOutputStacks.ts
index e5260f93a..79e20b76c 100644
--- a/src/platform/assets/composables/useOutputStacks.ts
+++ b/src/platform/assets/composables/useOutputStacks.ts
@@ -107,10 +107,16 @@ export function useOutputStacks({ assets }: UseOutputStacksOptions) {
     if (!metadata) {
       return []
     }
+
+    const excludeOutputKey =
+      metadata.nodeId && metadata.subfolder
+        ? `${metadata.nodeId}-${metadata.subfolder}-${asset.name}`
+        : undefined
+
     try {
       return await resolveOutputAssetItems(metadata, {
         createdAt: asset.created_at,
-        excludeOutputKey: asset.name
+        excludeOutputKey
       })
     } catch (error) {
       console.error('Failed to resolve stack children:', error)