diff --git a/desktop/src/components/chat/PlanModePermissionDialog.test.tsx b/desktop/src/components/chat/PlanModePermissionDialog.test.tsx
index 1ea8781d..77ec9cd2 100644
--- a/desktop/src/components/chat/PlanModePermissionDialog.test.tsx
+++ b/desktop/src/components/chat/PlanModePermissionDialog.test.tsx
@@ -189,6 +189,24 @@ describe('plan mode permission UI', () => {
     expect(container.textContent).not.toContain('Tool Output')
   })
 
+  it('does not render an empty plan preview for interrupted ExitPlanMode results', () => {
+    const { container } = render(
+      <ToolCallBlock
+        toolName="ExitPlanMode"
+        input={{}}
+        result={{
+          isError: true,
+          content: 'Tool permission request failed: AbortError',
+        }}
+      />,
+    )
+
+    expect(container.textContent).toContain('Plan rejected')
+    expect(container.textContent).toContain('Tool permission request failed: AbortError')
+    expect(container.textContent).not.toContain("Claude's plan")
+    expect(container.textContent).not.toContain('No plan content available.')
+  })
+
   it('renders EnterPlanMode as a compact status instead of raw model instructions', () => {
     const { container } = render(
       <ToolCallBlock
diff --git a/desktop/src/components/chat/ToolCallBlock.tsx b/desktop/src/components/chat/ToolCallBlock.tsx
index 33294f00..dcc65bc7 100644
--- a/desktop/src/components/chat/ToolCallBlock.tsx
+++ b/desktop/src/components/chat/ToolCallBlock.tsx
@@ -249,6 +249,12 @@ function PlanToolCallBlock({
 }) {
   const t = useTranslation()
   const preview = extractPlanPreview(input, result?.content)
+  const hasPlanPreview = Boolean(
+    preview.plan.trim() ||
+    preview.filePath ||
+    preview.allowedPrompts.length > 0,
+  )
+  const showPlanPreview = hasPlanPreview || !result?.isError
   const title = result?.isError
     ? t('permission.planRejected')
     : result
@@ -287,14 +293,16 @@ function PlanToolCallBlock({
 
       {expanded ? (
         <div className="space-y-2.5 border-t border-[var(--color-border)]/60 px-3 py-3">
-          <PlanPreviewCard
-            title={t('permission.planPreviewTitle')}
-            plan={preview.plan}
-            filePath={preview.filePath}
-            allowedPrompts={preview.allowedPrompts}
-            requestedPermissionsTitle={t('permission.planRequestedPermissions')}
-            emptyLabel={t('permission.planEmpty')}
-          />
+          {showPlanPreview ? (
+            <PlanPreviewCard
+              title={t('permission.planPreviewTitle')}
+              plan={preview.plan}
+              filePath={preview.filePath}
+              allowedPrompts={preview.allowedPrompts}
+              requestedPermissionsTitle={t('permission.planRequestedPermissions')}
+              emptyLabel={t('permission.planEmpty')}
+            />
+          ) : null}
           {result?.isError && hasRawResult ? (
             renderResultOutput(result, extractTextContent(result.content) ?? '', t)
           ) : null}